aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-07-23 12:29:22 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-07-23 12:29:22 -0700
commitb68e1f8d03be1271ff7b9bfc0a274bb2c10c8930 (patch)
tree1d23afac8b5fafd71c0c413069dfc6a63362dc3b
parent2980ce7c7096cbea33dd40acbeb4242fb4cd8037 (diff)
fix test_files* after the changes to stderr
-rwxr-xr-xtests/runner.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/runner.py b/tests/runner.py
index c31a22e6..ad8481cc 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -271,6 +271,8 @@ process(sys.argv[1])
print >> sys.stderr, "[was asm.js'ified]"
elif 'asm.js' in err: # if no asm.js error, then not an odin build
raise Exception("did NOT asm.js'ify")
+ err = '\n'.join(filter(lambda line: 'successfully compiled asm.js code' not in line, err.split('\n')))
+ return err
def run_generated_code(self, engine, filename, args=[], check_timeout=True, output_nicerizer=None):
stdout = os.path.join(self.get_dir(), 'stdout') # use files, as PIPE can get too full and hang us
@@ -286,7 +288,7 @@ process(sys.argv[1])
out = open(stdout, 'r').read()
err = open(stderr, 'r').read()
if engine == SPIDERMONKEY_ENGINE and Settings.ASM_JS:
- self.validate_asmjs(err)
+ err = self.validate_asmjs(err)
if output_nicerizer:
ret = output_nicerizer(out, err)
else: