diff --git a/Pal/regression/00_Bootstrap.py b/Pal/regression/00_Bootstrap.py index c001758321..6d9dd2ec07 100644 --- a/Pal/regression/00_Bootstrap.py +++ b/Pal/regression/00_Bootstrap.py @@ -95,7 +95,7 @@ def check_cpu_info(res): check=lambda res: "User Program Started" in res[0].log) rv = regression.run_checks() if rv: sys.exit(rv) - + # Running Bootstrap2 regression = Regression(loader, manifest_file("Bootstrap2")) @@ -182,7 +182,7 @@ def check_cpu_info(res): regression = Regression(loader, "fakenews") regression.add_check(name="Error on missing executable and manifest", - check=lambda res: "Executable not found" in res[0].log and + check=lambda res: "Executable not found" in res[0].log and any([line.startswith("USAGE: ") for line in res[0].log])) rv = regression.run_checks() diff --git a/Pal/regression/04_Ipc.py b/Pal/regression/04_Ipc.py index e9da89459a..2c72f176a6 100644 --- a/Pal/regression/04_Ipc.py +++ b/Pal/regression/04_Ipc.py @@ -6,16 +6,16 @@ sgx = os.environ['SGX_RUN'] except KeyError: sgx = 0 - + if sgx: print("Bulk IPC not supported on SGX") exit(0) -## XXX Should really be running these tests as part of CI +## XXX Should really be running these tests as part of CI if not os.path.exists('/dev/gipc'): print("GIPC not loaded; skipping these tests\n") exit(0) - + def prepare_files(args): with open("ipc_mapping.tmp", "w") as f: f.write("Hello World") diff --git a/Scripts/regression.py b/Scripts/regression.py index 159fa25788..15f73cacc4 100644 --- a/Scripts/regression.py +++ b/Scripts/regression.py @@ -89,7 +89,7 @@ def run_checks(self): something_failed = 1 if timed_out : print('Test timed out!') keep_log = True - + if self.keep_log and keep_log: sargs = [re.sub(r"\W", '_', a).strip('_') for a in args] filename = 'log-' + '_'.join(sargs) + '_' + time.strftime("%Y%m%d_%H%M%S")