aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-02-07 10:25:45 -0500
committerAlon Zakai <alonzakai@gmail.com>2014-02-07 10:25:45 -0500
commite56dbf9e7c329b91f43794320cc01b41f5f65d5a (patch)
treed084b4294039fb705c2cd9db60b261e9814d76bc
parentcb877f31cd61716774d5d3f532bf6082bdcf4162 (diff)
use emcc in s_x_x tests, to get libc
-rwxr-xr-xtests/runner.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py
index f59d5cb9..4dd93b1a 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -138,7 +138,11 @@ class RunnerCore(unittest.TestCase):
post1 = post_build
post2 = None
- if self.emcc_args is None:
+ emcc_args = self.emcc_args
+ if emcc_args is None:
+ emcc_args = []
+
+ if emcc_args is None: # legacy testing mode, no longer used
Building.emscripten(filename, append_ext=True, extra_args=extra_emscripten_args)
if post1:
exec post1 in locals()
@@ -160,7 +164,7 @@ process(sys.argv[1])
''')
transform.close()
transform_args = ['--js-transform', "%s %s" % (PYTHON, transform_filename)]
- Building.emcc(filename + '.o.ll', Settings.serialize() + self.emcc_args + transform_args + Building.COMPILER_TEST_OPTS, filename + '.o.js')
+ Building.emcc(filename + '.o.ll', Settings.serialize() + emcc_args + transform_args + Building.COMPILER_TEST_OPTS, filename + '.o.js')
if post2: post2(filename + '.o.js')
# Build JavaScript code from source code