diff options
| -rw-r--r-- | tests/runner.py | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/bindings_generator.py | 2 | ||||
| -rw-r--r-- | tools/shared.py | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py index 8c699330..d3d5beb8 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -29,7 +29,6 @@ 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') # Global cache for tests (we have multiple TestCase instances; this object lets them share data) @@ -2577,7 +2576,7 @@ if 'benchmark' not in sys.argv: open(header_filename, 'w').write(header) basename = os.path.join(self.get_dir(), 'bindingtest') - output = Popen(['python', BINDINGS_GENERATOR, basename, header_filename], stdout=PIPE, stderr=STDOUT).communicate()[0] + output = Popen([BINDINGS_GENERATOR, basename, header_filename], stdout=PIPE, stderr=STDOUT).communicate()[0] assert 'Traceback' not in output, 'Failure in binding generation: ' + output src = ''' diff --git a/tools/bindings_generator.py b/tools/bindings_generator.py index 359244ad..d436c311 100644..100755 --- a/tools/bindings_generator.py +++ b/tools/bindings_generator.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + ''' Use CppHeaderParser to parse some C++ headers, and generate binding code for them. diff --git a/tools/shared.py b/tools/shared.py index 8cb602df..9ccc2105 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -1,6 +1,10 @@ import shutil, time, os from subprocess import Popen, PIPE, STDOUT +abspath = os.path.abspath(os.path.dirname(__file__)) +def path_from_root(*pathelems): + return os.path.join(os.path.sep, *(abspath.split(os.sep)[:-1] + list(pathelems))) + CONFIG_FILE = os.path.expanduser('~/.emscripten') if not os.path.exists(CONFIG_FILE): shutil.copy(path_from_root('settings.py'), CONFIG_FILE) @@ -17,6 +21,8 @@ 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')) +BINDINGS_GENERATOR = path_from_root('tools', 'bindings_generator.py') + # Engine tweaks if '-s' not in SPIDERMONKEY_ENGINE: |