diff options
| author | alon@honor <none@none> | 2010-10-07 22:50:33 -0700 |
|---|---|---|
| committer | alon@honor <none@none> | 2010-10-07 22:50:33 -0700 |
| commit | d0eb15c81a09cf011c5f660413e593b0c09ff5fb (patch) | |
| tree | a71c70048458637f3a595a7e39b5cfee130a3e4a /tests | |
| parent | 4de0755572570e6de83788998e8288724b45b2fa (diff) | |
begin work to adapt to llvm 2.8 | TESTS BROKEN
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/runner.py | 4 | ||||
| -rw-r--r-- | tests/settings.py | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/tests/runner.py b/tests/runner.py index 2ce216f5..b134f739 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -57,12 +57,12 @@ class T(unittest.TestCase): raise Exception("Compilation error"); # LLVM binary ==> LLVM assembly - output = Popen([LLVM_DIS, filename + '.o', '-o=' + filename + '.o.llvm'], stdout=PIPE, stderr=STDOUT).communicate()[0] + output = Popen([LLVM_DIS, filename + '.o'] + LLVM_DIS_OPTS + ['-o=' + filename + '.o.ll'], stdout=PIPE, stderr=STDOUT).communicate()[0] # Run Emscripten emscripten_settings = ['{ "QUANTUM_SIZE": %d, "RELOOP": %d, "OPTIMIZE": %d }' % (QUANTUM_SIZE, RELOOP, OPTIMIZE)] out = open(filename + '.o.js', 'w') if not OUTPUT_TO_SCREEN else None - timeout_run(Popen([EMSCRIPTEN, filename + '.o.llvm', PARSER_ENGINE] + emscripten_settings, stdout=out, stderr=STDOUT), 240, 'Compiling') + timeout_run(Popen([EMSCRIPTEN, filename + '.o.ll', PARSER_ENGINE] + emscripten_settings, stdout=out, stderr=STDOUT), 240, 'Compiling') output = open(filename + '.o.js').read() if output_processor is not None: output_processor(output) diff --git a/tests/settings.py b/tests/settings.py index d6b24d66..21c7cef0 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,14 +1,15 @@ TEMP_DIR='/dev/shm' -CLANG=os.path.expanduser('~/Dev/llvm-2.7/cbuild/bin/clang++') -#CLANG=os.path.expanduser('~/Dev/llvm-2.8/cbuild/Release/bin/clang++') -LLVM_GCC=os.path.expanduser('~/Dev/llvm-gcc-2.7/cbuild/install/bin/llvm-g++') +LLVM_ROOT=os.path.expanduser('~/Dev/llvm-2.8/cbuild/Release/bin') # Might not need 'Release' + +CLANG=os.path.expanduser(os.path.join(LLVM_ROOT, 'clang++')) +LLVM_GCC=os.path.expanduser('~/Dev/llvm-gcc-4.2-2.8.source/cbuild/install/bin/llvm-g++') COMPILERS = { - 'clang': { - 'path': CLANG, - 'quantum_size': 4, # See settings.js - }, +# 'clang': { +# 'path': CLANG, +# 'quantum_size': 4, # See settings.js +# }, 'llvm_gcc': { 'path': LLVM_GCC, 'quantum_size': 1, @@ -18,15 +19,16 @@ COMPILERS = { 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') +LLVM_DIS=os.path.expanduser(os.path.join(LLVM_ROOT, 'llvm-dis')) +LLVM_DIS_OPTS=['-show-annotations'] SPIDERMONKEY_ENGINE=os.path.expanduser('~/Dev/mozilla-central/js/src/js') V8_ENGINE=os.path.expanduser('~/Dev/v8/d8') # XXX Warning: Compiling the 'sauer' test in SpiderMonkey can lead to an extreme amount of memory being # used, see Mozilla bug 593659. Possibly also some other tests as well. -#PARSER_ENGINE=SPIDERMONKEY_ENGINE -PARSER_ENGINE=V8_ENGINE +PARSER_ENGINE=SPIDERMONKEY_ENGINE +#PARSER_ENGINE=V8_ENGINE JS_ENGINE=SPIDERMONKEY_ENGINE #JS_ENGINE=V8_ENGINE |