refactor some tools stuff
This commit is contained in:
Родитель
501b729cd4
Коммит
1bef4bfa2a
|
@ -4250,11 +4250,9 @@ TT = %s
|
||||||
|
|
||||||
class OtherTests(RunnerCore):
|
class OtherTests(RunnerCore):
|
||||||
def test_eliminator(self):
|
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()
|
input = open(path_from_root('tools', 'eliminator', 'eliminator-test.js')).read()
|
||||||
expected = open(path_from_root('tools', 'eliminator', 'eliminator-test-output.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)
|
self.assertEquals(output, expected)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -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_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_INTERPRETER=os.path.expanduser(os.path.join(LLVM_ROOT, 'lli'))
|
||||||
LLVM_COMPILER=os.path.expanduser(os.path.join(LLVM_ROOT, 'llc'))
|
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')
|
EMSCRIPTEN = path_from_root('emscripten.py')
|
||||||
DEMANGLER = path_from_root('third_party', 'demangler.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')
|
DFE = path_from_root('tools', 'dead_function_eliminator.py')
|
||||||
BINDINGS_GENERATOR = path_from_root('tools', 'bindings_generator.py')
|
BINDINGS_GENERATOR = path_from_root('tools', 'bindings_generator.py')
|
||||||
EXEC_LLVM = path_from_root('tools', 'exec_llvm.py')
|
EXEC_LLVM = path_from_root('tools', 'exec_llvm.py')
|
||||||
|
VARIABLE_ELIMINATOR = path_from_root('tools', 'eliminator', 'eliminator.coffee')
|
||||||
|
|
||||||
# Additional compiler options
|
# Additional compiler options
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче