diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-01-10 13:31:25 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-01-10 13:31:25 -0800 |
commit | 4a472ca90a98b5d1d4084c0a501d6341a8cc2907 (patch) | |
tree | cabbd52bb27c3d4449ff90492138b9ea38d27643 | |
parent | b2827e02a2b996e501bf00fe884cd34370dbcca1 (diff) |
use NODE_JS when calling coffee and eliminator, to avoid problems with missing system node
-rw-r--r-- | tests/runner.py | 2 | ||||
-rw-r--r-- | tools/shared.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py index 67ba24dc..22e8ff1d 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -5465,7 +5465,7 @@ f.close() def test_eliminator(self): 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([COFFEESCRIPT, VARIABLE_ELIMINATOR], stdin=PIPE, stdout=PIPE).communicate(input)[0] + output = Popen([NODE_JS, COFFEESCRIPT, VARIABLE_ELIMINATOR], stdin=PIPE, stdout=PIPE).communicate(input)[0] self.assertIdentical(expected, output) def test_js_optimizer(self): diff --git a/tools/shared.py b/tools/shared.py index 1d97ff4b..5fdfdfb8 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -632,7 +632,7 @@ class Building: coffee = path_from_root('tools', 'eliminator', 'node_modules', 'coffee-script', 'bin', 'coffee') eliminator = path_from_root('tools', 'eliminator', 'eliminator.coffee') input = open(filename, 'r').read() - output, err = Popen([coffee, eliminator], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate(input) + output, err = Popen([NODE_JS, coffee, eliminator], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate(input) assert len(output) > 0, 'Error in eliminator: ' + err + '\n\n' + output filename += '.el.js' f = open(filename, 'w') |