diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-18 17:21:29 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-18 17:21:29 -0700 |
| commit | 50b263040597f52aae0706ebe7ffc6a44f016d11 (patch) | |
| tree | 99ea4ea8df3ceefd0ead6b1149716e3f6e13165e | |
| parent | 9ff73ac6691eb5d02f8ec3e82f92fd45ec16d172 (diff) | |
move some paths to tools/shared
| -rw-r--r-- | tests/runner.py | 9 | ||||
| -rw-r--r-- | tools/shared.py | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/tests/runner.py b/tests/runner.py index 1302818e..b8149810 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -28,15 +28,6 @@ try: except: raise Exception('Cannot find "COMPILER_OPTS" definition. Is ~/.emscripten set up properly? You may need to copy the template from settings.py into it.') -# Paths - -EMSCRIPTEN = path_from_root('emscripten.py') -DEMANGLER = path_from_root('third_party', 'demangler.py') -NAMESPACER = path_from_root('tools', 'namespacer.py') -EMMAKEN = path_from_root('tools', 'emmaken.py') -AUTODEBUGGER = path_from_root('tools', 'autodebugger.py') -DFE = path_from_root('tools', 'dead_function_eliminator.py') - # Global cache for tests (we have multiple TestCase instances; this object lets them share data) GlobalCache = {} diff --git a/tools/shared.py b/tools/shared.py index 8f630ad6..79dff5f1 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -10,7 +10,7 @@ if not os.path.exists(CONFIG_FILE): shutil.copy(path_from_root('settings.py'), CONFIG_FILE) exec(open(CONFIG_FILE, 'r').read()) -# Tools +# Tools/paths CLANG=os.path.expanduser(os.path.join(LLVM_ROOT, 'clang++')) LLVM_LINK=os.path.join(LLVM_ROOT, 'llvm-link') @@ -22,6 +22,12 @@ LLVM_DIS_OPTS = ['-show-annotations'] # For LLVM 2.8+. For 2.7, you may need to LLVM_INTERPRETER=os.path.expanduser(os.path.join(LLVM_ROOT, 'lli')) LLVM_COMPILER=os.path.expanduser(os.path.join(LLVM_ROOT, 'llc')) +EMSCRIPTEN = path_from_root('emscripten.py') +DEMANGLER = path_from_root('third_party', 'demangler.py') +NAMESPACER = path_from_root('tools', 'namespacer.py') +EMMAKEN = path_from_root('tools', 'emmaken.py') +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') |