support outlining with minification

1 files changed, 16 insertions, 15 deletions

diff --git a/tests/runner.py b/tests/runner.py
index c4beb5d3..6fd26a55 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -11064,21 +11064,22 @@ f.close()
               curr = None
           return ret
 
-        for outlining_limit in [100, 250, 500, 1000, 2000, 5000, 0]:
-          print '\n', outlining_limit, '\n'
-          # TODO: test without -g3, tell all sorts
-          Popen([PYTHON, EMCC, src] + libs + ['-o', 'test.js', '-O2', '-g3', '-s', 'OUTLINING_LIMIT=%d' % outlining_limit] + args).communicate()
-          assert os.path.exists('test.js')
-          shutil.copyfile('test.js', '%d_test.js' % outlining_limit)
-          for engine in JS_ENGINES:
-            out = run_js('test.js', engine=engine, stderr=PIPE, full_output=True)
-            self.assertContained(expected, out)
-            if engine == SPIDERMONKEY_ENGINE: self.validate_asmjs(out)
-          low = expected_ranges[outlining_limit][0]
-          seen = max(measure_funcs('test.js').values())
-          high = expected_ranges[outlining_limit][1]
-          print outlining_limit, '   ', low, '<=', seen, '<=', high
-          assert low <= seen <= high
+        for debug in ['-g1', '-g']:
+          for outlining_limit in [100, 250, 500, 1000, 2000, 5000, 0]:
+            print '\n', debug, outlining_limit, '\n'
+            # TODO: test without -g3, tell all sorts
+            Popen([PYTHON, EMCC, src] + libs + ['-o', 'test.js', '-O2', debug, '-s', 'OUTLINING_LIMIT=%d' % outlining_limit] + args).communicate()
+            assert os.path.exists('test.js')
+            shutil.copyfile('test.js', '%d_test.js' % outlining_limit)
+            for engine in JS_ENGINES:
+              out = run_js('test.js', engine=engine, stderr=PIPE, full_output=True)
+              self.assertContained(expected, out)
+              if engine == SPIDERMONKEY_ENGINE: self.validate_asmjs(out)
+            low = expected_ranges[outlining_limit][0]
+            seen = max(measure_funcs('test.js').values())
+            high = expected_ranges[outlining_limit][1]
+            print outlining_limit, '   ', low, '<=', seen, '<=', high
+            assert low <= seen <= high
 
       test('zlib', path_from_root('tests', 'zlib', 'example.c'), 
                    self.get_library('zlib', os.path.join('libz.a'), make_args=['libz.a']),