diff options
| -rw-r--r-- | tests/runner.py | 4 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/runner.py b/tests/runner.py index b8149810..5ad9077a 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -4250,11 +4250,9 @@ TT = %s class OtherTests(RunnerCore): def test_eliminator(self): - coffee = path_from_root('tools', 'eliminator', 'node_modules', 'coffee-script', 'bin', 'coffee') - eliminator = path_from_root('tools', 'eliminator', 'eliminator.coffee') input = open(path_from_root('tools', 'eliminator', 'eliminator-test.js')).read() expected = open(path_from_root('tools', 'eliminator', 'eliminator-test-output.js')).read() - output = Popen([coffee, eliminator], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate(input)[0] + output = Popen([COFFEESCRIPT, VARIABLE_ELIMINATOR], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate(input)[0] self.assertEquals(output, expected) else: diff --git a/tools/shared.py b/tools/shared.py index 79dff5f1..076a9d17 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -21,6 +21,7 @@ LLVM_DIS=os.path.expanduser(os.path.join(LLVM_ROOT, 'llvm-dis')) LLVM_DIS_OPTS = ['-show-annotations'] # For LLVM 2.8+. For 2.7, you may need to do just [] LLVM_INTERPRETER=os.path.expanduser(os.path.join(LLVM_ROOT, 'lli')) LLVM_COMPILER=os.path.expanduser(os.path.join(LLVM_ROOT, 'llc')) +COFFEESCRIPT = path_from_root('tools', 'eliminator', 'node_modules', 'coffee-script', 'bin', 'coffee') EMSCRIPTEN = path_from_root('emscripten.py') DEMANGLER = path_from_root('third_party', 'demangler.py') @@ -30,6 +31,7 @@ AUTODEBUGGER = path_from_root('tools', 'autodebugger.py') DFE = path_from_root('tools', 'dead_function_eliminator.py') BINDINGS_GENERATOR = path_from_root('tools', 'bindings_generator.py') EXEC_LLVM = path_from_root('tools', 'exec_llvm.py') +VARIABLE_ELIMINATOR = path_from_root('tools', 'eliminator', 'eliminator.coffee') # Additional compiler options |