aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-02-01 15:23:49 -0800
committerAlon Zakai <alonzakai@gmail.com>2012-02-01 15:23:49 -0800
commit4971364806bea54262ea5169e2af6c6222983964 (patch)
tree9d7837e997a303fe5819fa8f6686967d7d12c5d6 /tests
parent1060c3b01676719061f49fa43f015aa55be93800 (diff)
fix test_poppler and test_iostreamllvm-opts
Diffstat (limited to 'tests')
-rwxr-xr-xtests/runner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py
index b4c49271..2a0307e9 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -3970,7 +3970,7 @@ def process(filename):
if self.emcc_args is None:
if Building.LLVM_OPTS: return self.skip('optimizing bitcode before emcc can confuse libcxx inclusion')
self.emcc_args = [] # libc++ auto-inclusion is only done if we use emcc
- if self.emcc_args is None: Settings.SAFE_HEAP = 0 # Some spurious warnings from libc++ internals
+ Settings.SAFE_HEAP = 0 # Some spurious warnings from libc++ internals
src = '''
#include <iostream>
@@ -4363,7 +4363,7 @@ def process(filename):
# Combine libraries
- combined = os.path.join(self.get_build_dir(), 'combined.bc')
+ combined = os.path.join(self.get_dir(), 'poppler-combined.bc')
Building.link([freetype, poppler], combined)
self.do_ll_run(combined,