diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-06-09 18:42:05 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-06-09 18:42:05 -0700 |
| commit | 6a4ed46be4758c34bf74eb1ec903cd912d55fe0e (patch) | |
| tree | c9c9b9d48d2b4a0230235552486b962aeb2c57e0 | |
| parent | 3a3369d560fface3e0e8f094ac111d2b6ab18ec7 (diff) | |
enable ta2
| -rw-r--r-- | tests/runner.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/tests/runner.py b/tests/runner.py index a172881a..8c58d9d3 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -1944,12 +1944,14 @@ if 'benchmark' not in sys.argv: force_c=True) def test_the_bullet(self): # Called thus so it runs late in the alphabetical cycle... it is long - global SAFE_HEAP, SAFE_HEAP_LINES, COMPILER_TEST_OPTS + global SAFE_HEAP, SAFE_HEAP_LINES, COMPILER_TEST_OPTS, USE_TYPED_ARRAYS, LLVM_OPTS if LLVM_OPTS: SAFE_HEAP = 0 # Optimizations make it so we do not have debug info on the line we need to ignore if COMPILER == LLVM_GCC: global INIT_STACK; INIT_STACK = 1 # TODO: Investigate why this is necessary + if USE_TYPED_ARRAYS == 2 and LLVM_OPTS: return self.skip() # We have slightly different rounding here for some reason. TODO: activate this + if SAFE_HEAP: # Ignore bitfield warnings SAFE_HEAP = 3 @@ -2045,13 +2047,18 @@ if 'benchmark' not in sys.argv: #, build_ll_hook=self.do_autodebug) def test_openjpeg(self): + global USE_TYPED_ARRAYS global COMPILER_TEST_OPTS; COMPILER_TEST_OPTS = ['-g'] - global CORRECT_SIGNS; CORRECT_SIGNS = 2 - global CORRECT_SIGNS_LINES - if COMPILER == CLANG: - CORRECT_SIGNS_LINES = ["mqc.c:566"] + global CORRECT_SIGNS + if USE_TYPED_ARRAYS == 2: + CORRECT_SIGNS = 1 else: - CORRECT_SIGNS_LINES = ["mqc.c:566", "mqc.c:317"] + CORRECT_SIGNS = 2 + global CORRECT_SIGNS_LINES + if COMPILER == CLANG: + CORRECT_SIGNS_LINES = ["mqc.c:566"] + else: + CORRECT_SIGNS_LINES = ["mqc.c:566", "mqc.c:317"] original_j2k = path_from_root('tests', 'openjpeg', 'syntensity_lobby_s.j2k') @@ -2566,7 +2573,7 @@ TT = %s ('llvm_gcc', LLVM_GCC, 4, 0, 0), ('clang', CLANG, 1, 1, 1), ('clang', CLANG, 4, 1, 1), ('llvm_gcc', LLVM_GCC, 4, 1, 1), - #('clang', CLANG, 4, 1, 2), + ('clang', CLANG, 4, 1, 2), #('llvm_gcc', LLVM_GCC, 4, 1, 2), ]: fullname = '%s_%d_%d%s%s' % ( |