diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/runner.py | 2 | ||||
| -rw-r--r-- | tests/settings.py | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/tests/runner.py b/tests/runner.py index 6eb3df1f..982c758e 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -68,7 +68,7 @@ class T(unittest.TestCase): output = Popen([LLVM_DIS, filename + '.o', '-o=' + filename + '.o.llvm'], stdout=PIPE, stderr=STDOUT).communicate()[0] if DEBUG: print output # Run Emscripten - emscripten(filename + '.o.llvm', filename + '.o.js', JS_ENGINE) + emscripten(filename + '.o.llvm', filename + '.o.js', PARSER_ENGINE) output = open(filename + '.o.js').read() if output_processor is not None: output_processor(output) diff --git a/tests/settings.py b/tests/settings.py index 1ed85ed4..d4834faf 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -2,14 +2,13 @@ DEBUG=False TEMP_DIR='/dev/shm' LLVM_GCC=os.path.expanduser('~/Dev/llvm/llvm-gcc-27/cbuild/bin/bin/llvm-g++') LLVM_DIS=os.path.expanduser('~/Dev/llvm/llvm-27/cbuild/bin/llvm-dis') -PY_PARSER=path_from_root(['llvm-parser', 'parser.py']) -SPIDERMONKEY_SHELL=os.path.expanduser(os.path.expanduser('~/Dev/tracemonkey/js/src/js')) -V8_ENGINE=os.path.expanduser('~/Dev/v8/d8') # Note: Fails in test_strings etc. due to commandline arguments parsing -JS_ENGINE=SPIDERMONKEY_SHELL -JS_ENGINE_OPTS=[]#['-j'] -PARSER_ENGINE=SPIDERMONKEY_SHELL -PARSER_OPTS=[]#['-j'] -#PARSER_ENGINE=V8_ENGINE -#PARSER_OPTS = [] +SPIDERMONKEY_ENGINE=os.path.expanduser('~/Dev/tracemonkey/js/src/js') +V8_ENGINE=os.path.expanduser('~/Dev/v8/d8') + +#PARSER_ENGINE=SPIDERMONKEY_ENGINE +PARSER_ENGINE=V8_ENGINE + +JS_ENGINE=SPIDERMONKEY_ENGINE #JS_ENGINE=V8_ENGINE +JS_ENGINE_OPTS=[]#['-j'] |