diff options
| -rw-r--r-- | src/parseTools.js | 4 | ||||
| -rw-r--r-- | tests/runner.py | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/parseTools.js b/src/parseTools.js index e94279ee..03a529a1 100644 --- a/src/parseTools.js +++ b/src/parseTools.js @@ -1535,9 +1535,9 @@ function processMathop(item) { with(item) { ident1 = makeSignOp(ident1, type, 're'); ident2 = makeSignOp(ident2, type, 're'); if (variant === 'eq') { - return ident1 + '[0] == ' + ident2 + '[0] && ' + ident1 + '[0] == ' + ident2 + '[0]'; + return ident1 + '[0] == ' + ident2 + '[0] && ' + ident1 + '[1] == ' + ident2 + '[1]'; } else { - return ident1 + '[0] != ' + ident2 + '[0] || ' + ident1 + '[0] != ' + ident2 + '[0]'; + return ident1 + '[0] != ' + ident2 + '[0] || ' + ident1 + '[1] != ' + ident2 + '[1]'; } } default: throw 'Unknown icmp variant: ' + variant; diff --git a/tests/runner.py b/tests/runner.py index dd3bd3ff..c1743e39 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -477,13 +477,11 @@ if 'benchmark' not in str(sys.argv): uint32_t usmall = -1; uint64_t ularge = -1; printf("*%d*\n", usmall == ularge); - usmall++; - printf("*%d*\n", usmall == ularge); return 0; } ''' - self.do_run(src, '*1*\n*0*\n*1*\n*0*') + self.do_run(src, '*1*\n*0*\n*0*\n') def test_unaligned(self): if Settings.QUANTUM_SIZE == 1: return self.skip('No meaning to unaligned addresses in q1') @@ -2267,6 +2265,8 @@ if 'benchmark' not in str(sys.argv): post_build=add_pre_run_and_checks) def test_dlfcn_alias(self): + if Building.LLVM_OPTS == 2: return self.skip('LLVM LTO will optimize away stuff we expect from the shared library') + lib_src = r''' #include <stdio.h> extern int parent_global; @@ -2315,7 +2315,9 @@ if 'benchmark' not in str(sys.argv): Settings.INCLUDE_FULL_LIBRARY = 0 def test_dlfcn_varargs(self): + if Building.LLVM_OPTS == 2: return self.skip('LLVM LTO will optimize things that prevent shared objects from working') if Settings.QUANTUM_SIZE == 1: return self.skip('FIXME: Add support for this') + lib_src = r''' void print_ints(int n, ...); extern "C" void func() { @@ -2364,8 +2366,7 @@ if 'benchmark' not in str(sys.argv): '''FS.createLazyFile('/', 'liblib.so', 'liblib.so', true, false);''' ) open(filename, 'w').write(src) - self.do_run(src, '100*200*13*42*', - output_nicerizer=lambda x: x.replace('\n', '*'), + self.do_run(src, '100\n200\n13\n42\n', post_build=add_pre_run_and_checks) def test_rand(self): |