Merge branch 'fastcomp-by-default' into incoming

1 files changed, 14 insertions, 4 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 501299c7..32575a1a 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -27,6 +27,19 @@ sys.path += [path_from_root(''), path_from_root('third_party/websockify')]
 import tools.shared
 from tools.shared import *
 
+# Utils
+
+def nonfastcomp(test):
+  try:
+    old_fastcomp = os.environ.get('EMCC_FAST_COMPILER')
+    os.environ['EMCC_FAST_COMPILER'] = '0'
+    test()
+  finally:
+    if old_fastcomp is None:
+      del os.environ['EMCC_FAST_COMPILER']
+    else:
+      os.environ['EMCC_FAST_COMPILER'] = old_fastcomp
+
 # Sanity check for config
 
 try:
@@ -36,10 +49,7 @@ except:
 
 # Core test runner class, shared between normal tests and benchmarks
 checked_sanity = False
-if os.environ.get('EMCC_FAST_COMPILER') == '1':
-  test_modes = ['default', 'asm1', 'asm2', 'asm3', 'asm2f', 'asm2g']
-else:
-  test_modes = ['default', 'o1', 'o2', 'asm1', 'asm2', 'asm3', 'asm2f', 'asm2g', 'asm2x86', 's_0_0', 's_0_1']
+test_modes = ['default', 'asm1', 'asm2', 'asm3', 'asm2f', 'asm2g', 'slow2', 'slow2asm', 's_0_0', 's_0_1']
 test_index = 0
 
 class RunnerCore(unittest.TestCase):