aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2012-11-09 20:00:33 +0200
committerJukka Jylänki <jujjyl@gmail.com>2012-11-09 20:00:33 +0200
commit932bc9d41154405028b24ab57a23a6ced53b29f9 (patch)
tree13ce860ea812064af7b963d790aee854ba81fc33
parent2ffd8b855ea368ff9aca3553a33414c20fb7a9a5 (diff)
Fixed a result parsing issue in test_pgo on Windows.
The previous code assert assumed to find a string 'Overflow|.*src.cpp:6 : 60 hits, %20 failures', but building on Windows gave a string of form 'Overflow|tmpCemscripten_tempCsrc.cpp:6 : 60 hits, %20 failures', i.e. prepending the path to the source file in the result. Now using a regex to accept both forms.
-rwxr-xr-xtests/runner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py
index 9c8219fb..f4c1bf3a 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -6956,8 +6956,8 @@ def process(filename):
def check(output):
# TODO: check the line #
if self.emcc_args is None or self.emcc_args == []: # LLVM full opts optimize out some corrections
- assert 'Overflow|src.cpp:6 : 60 hits, %20 failures' in output, 'no indication of Overflow corrections: ' + output
- assert 'UnSign|src.cpp:13 : 6 hits, %17 failures' in output, 'no indication of Sign corrections: ' + output
+ assert re.search('^Overflow\|.*src.cpp:6 : 60 hits, %20 failures$', output, re.M), 'no indication of Overflow corrections: ' + output
+ assert re.search('^UnSign\|.*src.cpp:13 : 6 hits, %17 failures$', output, re.M), 'no indication of Sign corrections: ' + output
return output
print >>sys.stderr, '1'