diff options
| author | alon@honor <none@none> | 2010-10-09 10:39:57 -0700 |
|---|---|---|
| committer | alon@honor <none@none> | 2010-10-09 10:39:57 -0700 |
| commit | b7a45a4236221343f96642499d1dfc84f327fb9b (patch) | |
| tree | 5949c61317f35980c05fd4f8af5ba29c0f0c2121 /tests | |
| parent | f209c923ca69d6d1cdcd25e71a62afc133bbdc8d (diff) | |
make llvm 2.7/clang work again
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/runner.py | 2 | ||||
| -rw-r--r-- | tests/settings.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/runner.py b/tests/runner.py index b134f739..95b5ba64 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -45,7 +45,9 @@ class T(unittest.TestCase): # C++ => LLVM binary try: + # Make sure we notice if compilation steps failed os.remove(filename + '.o') + os.remove(filename + '.o.ll') except: pass os.chdir(dirname) diff --git a/tests/settings.py b/tests/settings.py index 3f8de1a0..ba6ef812 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,6 +1,7 @@ TEMP_DIR='/dev/shm' LLVM_ROOT=os.path.expanduser('~/Dev/llvm-2.8/cbuild/Release/bin') # Might not need 'Release' +#LLVM_ROOT=os.path.expanduser('~/Dev/llvm-2.7/cbuild/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++') @@ -20,7 +21,9 @@ COMPILER_OPTS = ['-m32'] # Need to build as 32bit arch, for now - # various errors on 64bit compilation LLVM_DIS=os.path.expanduser(os.path.join(LLVM_ROOT, 'llvm-dis')) -LLVM_DIS_OPTS=['-show-annotations'] +LLVM_DIS_OPTS = [] +if '2.8' in LLVM_ROOT: + LLVM_DIS_OPTS += ['-show-annotations'] SPIDERMONKEY_ENGINE=os.path.expanduser('~/Dev/mozilla-central/js/src/js') V8_ENGINE=os.path.expanduser('~/Dev/v8/d8') |