diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/runner.py | 11 | ||||
| -rw-r--r-- | tests/settings.py | 19 |
2 files changed, 19 insertions, 11 deletions
diff --git a/tests/runner.py b/tests/runner.py index 78e500ef..b138e61f 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -56,7 +56,7 @@ class T(unittest.TestCase): pass os.chdir(dirname) cwd = os.getcwd() - output = Popen([LLVM_GCC, '-DEMSCRIPTEN', '-emit-llvm', '-c', filename, '-o', filename + '.o'], stdout=PIPE, stderr=STDOUT).communicate()[0] + output = Popen([COMPILER, '-DEMSCRIPTEN', '-emit-llvm'] + COMPILER_OPTS + ['-c', filename, '-o', filename + '.o'], stdout=PIPE, stderr=STDOUT).communicate()[0] os.chdir(cwd) if not os.path.exists(filename + '.o'): print "Failed to compile C/C++ source:\n\n", output @@ -740,12 +740,9 @@ class T(unittest.TestCase): self.do_test(path_from_root(['tests', 'sauer']), '*\nTemp is 33\n9\n5\nhello, everyone\n*', main_file='command.cpp', emscripten_settings='{"RELOOP": 0}') if __name__ == '__main__': - if DEBUG: print "LLVM_GCC:", LLVM_GCC - if DEBUG: print "LLC:", LLC - if DEBUG: print "PARSER:", PARSER - if DEBUG: print "JS_ENGINE:", JS_ENGINE - for cmd in [LLVM_GCC, JS_ENGINE]: - if DEBUG: print "Checking for existence of", cmd + for cmd in [COMPILER, LLVM_DIS, PARSER_ENGINE, JS_ENGINE]: + print "Checking for existence of", cmd assert(os.path.exists(cmd)) + print "Running Emscripten tests..." unittest.main() diff --git a/tests/settings.py b/tests/settings.py index f15b8ec5..513db6bf 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,8 +1,18 @@ DEBUG=False TEMP_DIR='/dev/shm' -LLVM_GCC=os.path.expanduser('~/Dev/llvm/llvm-gcc-27/cbuild/bin/bin/llvm-g++') -LLVM_DIS=os.path.expanduser('~/Dev/llvm/llvm-27/cbuild/bin/llvm-dis') -SPIDERMONKEY_ENGINE=os.path.expanduser('~/Dev/m-c/js/src/js') + +CLANG=os.path.expanduser('~/Dev/llvm-2.7/cbuild/bin/clang++') +LLVM_GCC=os.path.expanduser('~/Dev/llvm-gcc-2.7/cbuild/install/bin/llvm-g++') + +#COMPILER=LLVM_GCC +COMPILER=CLANG + +COMPILER_OPTS = ['-m32'] # Need to build as 32bit arch, for now - + # various errors on 64bit compilation + +LLVM_DIS=os.path.expanduser('~/Dev/llvm-2.7/cbuild/bin/llvm-dis') + +SPIDERMONKEY_ENGINE=os.path.expanduser('~/Dev/m-c-ff/js/src/js') V8_ENGINE=os.path.expanduser('~/Dev/v8/d8') # XXX Warning: Running the 'sauer' test in SpiderMonkey can lead to an extreme amount of memory being @@ -12,5 +22,6 @@ PARSER_ENGINE=V8_ENGINE JS_ENGINE=SPIDERMONKEY_ENGINE #JS_ENGINE=V8_ENGINE -JS_ENGINE_OPTS=[]#['-j'] + +JS_ENGINE_OPTS=[] |