diff options
| -rwxr-xr-x | tests/fuzz/creduce_tester.py | 2 | ||||
| -rwxr-xr-x | tests/fuzz/csmith_driver.py | 2 | ||||
| -rw-r--r-- | tests/test_sanity.py | 10 | ||||
| -rw-r--r-- | tools/make_minigzip.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/fuzz/creduce_tester.py b/tests/fuzz/creduce_tester.py index d5618c2e..6bf9473f 100755 --- a/tests/fuzz/creduce_tester.py +++ b/tests/fuzz/creduce_tester.py @@ -34,7 +34,7 @@ except Exception, e: print '4) Compile JS-ly and compare' def try_js(args): - shared.check_execute([shared.EMCC] + EMCC_ARGS + CSMITH_CFLAGS + args + + shared.check_execute([shared.PYTHON, shared.EMCC] + EMCC_ARGS + CSMITH_CFLAGS + args + [filename, '-o', js_filename]) js = shared.run_js(js_filename, stderr=PIPE, engine=ENGINE) assert correct == js diff --git a/tests/fuzz/csmith_driver.py b/tests/fuzz/csmith_driver.py index 23b46188..5c83e92f 100755 --- a/tests/fuzz/csmith_driver.py +++ b/tests/fuzz/csmith_driver.py @@ -89,7 +89,7 @@ while 1: def try_js(args): shared.try_delete(filename + '.js') print '(compile)' - shared.check_execute([shared.EMCC, opts, fullname, '-o', filename + '.js'] + CSMITH_CFLAGS + args) + shared.check_execute([shared.PYTHON, shared.EMCC, opts, fullname, '-o', filename + '.js'] + CSMITH_CFLAGS + args) assert os.path.exists(filename + '.js') print '(run)' js = shared.run_js(filename + '.js', stderr=PIPE, engine=engine1, check_timeout=True) diff --git a/tests/test_sanity.py b/tests/test_sanity.py index cc0819a7..d258cff6 100644 --- a/tests/test_sanity.py +++ b/tests/test_sanity.py @@ -3,7 +3,7 @@ from runner import RunnerCore, path_from_root from tools.shared import * SANITY_FILE = CONFIG_FILE + '_sanity' -commands = [[EMCC], [PYTHON, path_from_root('tests', 'runner.py'), 'blahblah']] +commands = [[PYTHON, EMCC], [PYTHON, path_from_root('tests', 'runner.py'), 'blahblah']] def restore(): shutil.copyfile(CONFIG_FILE + '_backup', CONFIG_FILE) @@ -421,12 +421,12 @@ fi restore() def ensure_cache(): - self.do([EMCC, '-O2', path_from_root('tests', 'hello_world.c')]) + self.do([PYTHON, EMCC, '-O2', path_from_root('tests', 'hello_world.c')]) # Manual cache clearing ensure_cache() assert os.path.exists(EMCC_CACHE) - output = self.do([EMCC, '--clear-cache']) + output = self.do([PYTHON, EMCC, '--clear-cache']) assert ERASING_MESSAGE in output assert not os.path.exists(EMCC_CACHE) @@ -436,7 +436,7 @@ fi try: os.environ['LLVM'] = 'waka' assert os.path.exists(EMCC_CACHE) - output = self.do([EMCC]) + output = self.do([PYTHON, EMCC]) assert ERASING_MESSAGE in output assert not os.path.exists(EMCC_CACHE) finally: @@ -594,7 +594,7 @@ fi temp_dir = tempfile.mkdtemp(prefix='emscripten_temp_') os.chdir(temp_dir) - self.do([EMCC, '-O2', '--em-config', custom_config_filename, path_from_root('tests', 'hello_world.c')]) + self.do([PYTHON, EMCC, '-O2', '--em-config', custom_config_filename, path_from_root('tests', 'hello_world.c')]) result = run_js('a.out.js') # Clean up created temp files. diff --git a/tools/make_minigzip.py b/tools/make_minigzip.py index 0c96457b..cc097a6e 100644 --- a/tools/make_minigzip.py +++ b/tools/make_minigzip.py @@ -9,5 +9,5 @@ zlib = shared.Building.build_library('zlib', shared.EMSCRIPTEN_TEMP_DIR, shared. print 'Building minigzip' -Popen(['python2', shared.EMCC, '-O2', shared.path_from_root('tests', 'zlib', 'minigzip.c'), zlib, '-o', shared.path_from_root('tools', 'minigzip.js')]).communicate() +Popen([shared.PYTHON, shared.EMCC, '-O2', shared.path_from_root('tests', 'zlib', 'minigzip.c'), zlib, '-o', shared.path_from_root('tools', 'minigzip.js')]).communicate() |