diff options
Diffstat (limited to 'chromium/v8/tools/testrunner/local')
| -rw-r--r-- | chromium/v8/tools/testrunner/local/old_statusfile.py | 2 | ||||
| -rw-r--r-- | chromium/v8/tools/testrunner/local/statusfile.py | 7 | ||||
| -rw-r--r-- | chromium/v8/tools/testrunner/local/testsuite.py | 47 | ||||
| -rw-r--r-- | chromium/v8/tools/testrunner/local/verbose.py | 2 |
4 files changed, 22 insertions, 36 deletions
diff --git a/chromium/v8/tools/testrunner/local/old_statusfile.py b/chromium/v8/tools/testrunner/local/old_statusfile.py index d634e3ec955..a9a62036ec4 100644 --- a/chromium/v8/tools/testrunner/local/old_statusfile.py +++ b/chromium/v8/tools/testrunner/local/old_statusfile.py @@ -37,7 +37,6 @@ OKAY = 'OKAY' TIMEOUT = 'TIMEOUT' CRASH = 'CRASH' SLOW = 'SLOW' -FLAKY = 'FLAKY' # These are just for the status files and are mapped below in DEFS: FAIL_OK = 'FAIL_OK' PASS_OR_FAIL = 'PASS_OR_FAIL' @@ -49,7 +48,6 @@ KEYWORDS = {SKIP: SKIP, TIMEOUT: TIMEOUT, CRASH: CRASH, SLOW: SLOW, - FLAKY: FLAKY, FAIL_OK: FAIL_OK, PASS_OR_FAIL: PASS_OR_FAIL} diff --git a/chromium/v8/tools/testrunner/local/statusfile.py b/chromium/v8/tools/testrunner/local/statusfile.py index 1d30fe3d3c1..634fe6a08a8 100644 --- a/chromium/v8/tools/testrunner/local/statusfile.py +++ b/chromium/v8/tools/testrunner/local/statusfile.py @@ -42,7 +42,6 @@ OKAY = "OKAY" TIMEOUT = "TIMEOUT" CRASH = "CRASH" SLOW = "SLOW" -FLAKY = "FLAKY" # These are just for the status files and are mapped below in DEFS: FAIL_OK = "FAIL_OK" PASS_OR_FAIL = "PASS_OR_FAIL" @@ -50,7 +49,7 @@ PASS_OR_FAIL = "PASS_OR_FAIL" ALWAYS = "ALWAYS" KEYWORDS = {} -for key in [SKIP, FAIL, PASS, OKAY, TIMEOUT, CRASH, SLOW, FLAKY, FAIL_OK, +for key in [SKIP, FAIL, PASS, OKAY, TIMEOUT, CRASH, SLOW, FAIL_OK, PASS_OR_FAIL, ALWAYS]: KEYWORDS[key] = key @@ -69,10 +68,6 @@ def DoSkip(outcomes): def IsFlaky(outcomes): - return FLAKY in outcomes - - -def IsPassOrFail(outcomes): return ((PASS in outcomes) and (FAIL in outcomes) and (not CRASH in outcomes) and (not OKAY in outcomes)) diff --git a/chromium/v8/tools/testrunner/local/testsuite.py b/chromium/v8/tools/testrunner/local/testsuite.py index b0372e7f739..473e8b1efed 100644 --- a/chromium/v8/tools/testrunner/local/testsuite.py +++ b/chromium/v8/tools/testrunner/local/testsuite.py @@ -66,10 +66,7 @@ class TestSuite(object): # Used in the status file and for stdout printing. def CommonTestName(self, testcase): - if utils.IsWindows(): - return testcase.path.replace("\\", "/") - else: - return testcase.path + return testcase.path def ListTests(self, context): raise NotImplementedError @@ -87,36 +84,32 @@ class TestSuite(object): def ReadTestCases(self, context): self.tests = self.ListTests(context) - @staticmethod - def _FilterFlaky(flaky, mode): - return (mode == "run" and not flaky) or (mode == "skip" and flaky) - - def FilterTestCasesByStatus(self, warn_unused_rules, flaky_tests="dontcare"): + def FilterTestCasesByStatus(self, warn_unused_rules): filtered = [] used_rules = set() for t in self.tests: - flaky = False testname = self.CommonTestName(t) + if utils.IsWindows(): + testname = testname.replace("\\", "/") if testname in self.rules: used_rules.add(testname) - # Even for skipped tests, as the TestCase object stays around and - # PrintReport() uses it. - t.outcomes = self.rules[testname] - if statusfile.DoSkip(t.outcomes): + outcomes = self.rules[testname] + t.outcomes = outcomes # Even for skipped tests, as the TestCase + # object stays around and PrintReport() uses it. + if statusfile.DoSkip(outcomes): continue # Don't add skipped tests to |filtered|. - flaky = statusfile.IsFlaky(t.outcomes) - skip = False - for rule in self.wildcards: - assert rule[-1] == '*' - if testname.startswith(rule[:-1]): - used_rules.add(rule) - t.outcomes = self.wildcards[rule] - if statusfile.DoSkip(t.outcomes): - skip = True - break # "for rule in self.wildcards" - flaky = flaky or statusfile.IsFlaky(t.outcomes) - if skip or self._FilterFlaky(flaky, flaky_tests): - continue # "for t in self.tests" + if len(self.wildcards) != 0: + skip = False + for rule in self.wildcards: + assert rule[-1] == '*' + if testname.startswith(rule[:-1]): + used_rules.add(rule) + outcomes = self.wildcards[rule] + t.outcomes = outcomes + if statusfile.DoSkip(outcomes): + skip = True + break # "for rule in self.wildcards" + if skip: continue # "for t in self.tests" filtered.append(t) self.tests = filtered diff --git a/chromium/v8/tools/testrunner/local/verbose.py b/chromium/v8/tools/testrunner/local/verbose.py index 00c330d2d9c..f6934675231 100644 --- a/chromium/v8/tools/testrunner/local/verbose.py +++ b/chromium/v8/tools/testrunner/local/verbose.py @@ -54,7 +54,7 @@ def PrintReport(tests): skipped += 1 continue if statusfile.TIMEOUT in o: timeout += 1 - if statusfile.IsPassOrFail(o): nocrash += 1 + if statusfile.IsFlaky(o): nocrash += 1 if list(o) == [statusfile.PASS]: passes += 1 if statusfile.IsFailOk(o): fail_ok += 1 if list(o) == [statusfile.FAIL]: fail += 1 |