Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: tools/testrunner/local/testsuite.py

Issue 1153073002: [test] Correctly merge expected test outcomes. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/testrunner/objects/testcase.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testrunner/local/testsuite.py
diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py
index 0b38d8c0386af39208e5925bf656e83c6f340cbb..91a3e045258f3c7509b4d7cfe1806ecbd0dcbafe 100644
--- a/tools/testrunner/local/testsuite.py
+++ b/tools/testrunner/local/testsuite.py
@@ -150,7 +150,7 @@ class TestSuite(object):
assert rule[-1] == '*'
if testname.startswith(rule[:-1]):
used_rules.add(rule)
- t.outcomes = self.wildcards[rule]
+ t.outcomes |= self.wildcards[rule]
if statusfile.DoSkip(t.outcomes):
skip = True
break # "for rule in self.wildcards"
« no previous file with comments | « no previous file | tools/testrunner/objects/testcase.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698