improve option to disable exception catching; fixes ammo speed regression

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 11f3c804..5674a160 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -180,7 +180,7 @@ class RunnerCore(unittest.TestCase):
   def do_emscripten(self, filename, output_processor=None, append_ext=True, extra_args=[]):
     # Run Emscripten
     exported_settings = {}
-    for setting in ['QUANTUM_SIZE', 'RELOOP', 'OPTIMIZE', 'ASSERTIONS', 'USE_TYPED_ARRAYS', 'SAFE_HEAP', 'CHECK_OVERFLOWS', 'CORRECT_OVERFLOWS', 'CORRECT_SIGNS', 'CHECK_SIGNS', 'CORRECT_OVERFLOWS_LINES', 'CORRECT_SIGNS_LINES', 'CORRECT_ROUNDINGS', 'CORRECT_ROUNDINGS_LINES', 'INVOKE_RUN', 'SAFE_HEAP_LINES', 'INIT_STACK', 'AUTO_OPTIMIZE', 'EXPORTED_FUNCTIONS', 'EXPORTED_GLOBALS', 'BUILD_AS_SHARED_LIB', 'INCLUDE_FULL_LIBRARY', 'RUNTIME_TYPE_INFO', 'DISABLE_EXCEPTIONS', 'FAST_MEMORY', 'EXCEPTION_DEBUG', 'PROFILE']:
+    for setting in ['QUANTUM_SIZE', 'RELOOP', 'OPTIMIZE', 'ASSERTIONS', 'USE_TYPED_ARRAYS', 'SAFE_HEAP', 'CHECK_OVERFLOWS', 'CORRECT_OVERFLOWS', 'CORRECT_SIGNS', 'CHECK_SIGNS', 'CORRECT_OVERFLOWS_LINES', 'CORRECT_SIGNS_LINES', 'CORRECT_ROUNDINGS', 'CORRECT_ROUNDINGS_LINES', 'INVOKE_RUN', 'SAFE_HEAP_LINES', 'INIT_STACK', 'AUTO_OPTIMIZE', 'EXPORTED_FUNCTIONS', 'EXPORTED_GLOBALS', 'BUILD_AS_SHARED_LIB', 'INCLUDE_FULL_LIBRARY', 'RUNTIME_TYPE_INFO', 'DISABLE_EXCEPTION_CATCHING', 'FAST_MEMORY', 'EXCEPTION_DEBUG', 'PROFILE']:
       try:
         value = eval(setting)
         exported_settings[setting] = value
@@ -990,8 +990,8 @@ if 'benchmark' not in str(sys.argv):
         '''
         self.do_test(src, '*throw...caught!infunc...done!*')
 
-        global DISABLE_EXCEPTIONS
-        DISABLE_EXCEPTIONS = 1
+        global DISABLE_EXCEPTION_CATCHING
+        DISABLE_EXCEPTION_CATCHING = 1
         self.do_test(src, 'Compiled code throwing an exception')
 
     def test_typed_exceptions(self):
@@ -3147,7 +3147,7 @@ if 'benchmark' not in str(sys.argv):
       global CORRECT_OVERFLOWS; CORRECT_OVERFLOWS = 0
       global CORRECT_ROUNDINGS; CORRECT_ROUNDINGS = 0
       global SAFE_HEAP; SAFE_HEAP = 0 # uses time.h to set random bytes, other stuff
-      global DISABLE_EXCEPTIONS; DISABLE_EXCEPTIONS = 1
+      global DISABLE_EXCEPTION_CATCHING; DISABLE_EXCEPTION_CATCHING = 1
       global FAST_MEMORY; FAST_MEMORY = 4*1024*1024
 
       global INVOKE_RUN; INVOKE_RUN = 0 # We append code that does run() ourselves
@@ -4141,7 +4141,7 @@ Child2:9
     exec('''
 class %s(T):
   def setUp(self):
-    global COMPILER, QUANTUM_SIZE, RELOOP, OPTIMIZE, ASSERTIONS, USE_TYPED_ARRAYS, LLVM_OPTS, SAFE_HEAP, CHECK_OVERFLOWS, CORRECT_OVERFLOWS, CORRECT_OVERFLOWS_LINES, CORRECT_SIGNS, CORRECT_SIGNS_LINES, CHECK_SIGNS, COMPILER_TEST_OPTS, CORRECT_ROUNDINGS, CORRECT_ROUNDINGS_LINES, INVOKE_RUN, SAFE_HEAP_LINES, INIT_STACK, AUTO_OPTIMIZE, RUNTIME_TYPE_INFO, DISABLE_EXCEPTIONS, PROFILE
+    global COMPILER, QUANTUM_SIZE, RELOOP, OPTIMIZE, ASSERTIONS, USE_TYPED_ARRAYS, LLVM_OPTS, SAFE_HEAP, CHECK_OVERFLOWS, CORRECT_OVERFLOWS, CORRECT_OVERFLOWS_LINES, CORRECT_SIGNS, CORRECT_SIGNS_LINES, CHECK_SIGNS, COMPILER_TEST_OPTS, CORRECT_ROUNDINGS, CORRECT_ROUNDINGS_LINES, INVOKE_RUN, SAFE_HEAP_LINES, INIT_STACK, AUTO_OPTIMIZE, RUNTIME_TYPE_INFO, DISABLE_EXCEPTION_CATCHING, PROFILE
 
     COMPILER = '%s'
     llvm_opts = %d
@@ -4164,7 +4164,7 @@ class %s(T):
     CHECK_SIGNS = 0 #1-(embetter or llvm_opts)
     INIT_STACK = 0
     RUNTIME_TYPE_INFO = 0
-    DISABLE_EXCEPTIONS = 0
+    DISABLE_EXCEPTION_CATCHING = 0
     PROFILE = 0
     if LLVM_OPTS:
       self.pick_llvm_opts(3, True)
@@ -4233,7 +4233,7 @@ else:
   CORRECT_ROUNDINGS = 0
   CORRECT_OVERFLOWS_LINES = CORRECT_SIGNS_LINES = CORRECT_ROUNDINGS_LINES = SAFE_HEAP_LINES = []
   LLVM_OPTS = 1
-  DISABLE_EXCEPTIONS = 1
+  DISABLE_EXCEPTION_CATCHING = 1
   FAST_MEMORY = 10*1024*1024
 
   TEST_REPS = 4