Преглед на файлове

[*/regression] Increase timeout of regression tests

On weaker machines (Intel NUCs and SGX-enabled laptops),
SGX regression tests take longer than 5 seconds because
Graphene measures/zeroes all enclave memory at startup.
Increase the timeout for SGX regression tests to 20 sec.
Dmitrii Kuvaiskii преди 6 години
родител
ревизия
bd72b968ee
променени са 4 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 1 1
      LibOS/shim/test/regression/Makefile
  2. 1 1
      Pal/regression/00_Bootstrap.py
  3. 1 1
      Pal/regression/02_Misc.py
  4. 1 1
      Pal/regression/Makefile

+ 1 - 1
LibOS/shim/test/regression/Makefile

@@ -49,7 +49,7 @@ endif
 PYTHONENV="PYTHONPATH=../../../../Scripts"
 
 ifeq ($(SGX_RUN),1)
-	PYTHONENV += "TIMEOUT=5000"
+	PYTHONENV += "TIMEOUT=20000"
 endif
 
 .PHONY: regression

+ 1 - 1
Pal/regression/00_Bootstrap.py

@@ -157,7 +157,7 @@ if rv: sys.exit(rv)
 
 # Running Bootstrap6.manifest - SGX-specific test
 if sgx:
-    regression = Regression(loader, manifest_file("Bootstrap6"), timeout = 100000)
+    regression = Regression(loader, manifest_file("Bootstrap6"), timeout = 200000)
     regression.add_check(name="8GB Enclave Creation (SGX Only)",
                          check=lambda res: "Loaded Manifest: file:Bootstrap6.manifest.sgx" in res[0].log and
                          "Executable Range OK" in res[0].log)

+ 1 - 1
Pal/regression/02_Misc.py

@@ -3,7 +3,7 @@ from regression import Regression
 
 loader = os.environ['PAL_LOADER']
 
-regression = Regression(loader, "Misc", timeout=5000)
+regression = Regression(loader, "Misc")
 
 regression.add_check(name="Query System Time",
     check=lambda res: "Query System Time OK" in res[0].log)

+ 1 - 1
Pal/regression/Makefile

@@ -76,7 +76,7 @@ endif
 PYTHONENV = "PYTHONPATH=../../Scripts"
 
 ifeq ($(SGX_RUN),1)
-	PYTHONENV += "TIMEOUT=5000"
+	PYTHONENV += "TIMEOUT=20000"
 endif
 
 regression: $(call expand_target,$(target))