[test] Remove PASS_OR_FAIL and TIMEOUT statusfile outcomes.

Bug: v8:6917
Change-Id: I767e5b0fa2bfef73feb3e0bc568c00d22424afa8
Reviewed-on: https://chromium-review.googlesource.com/782560Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michał Majewski <majeski@google.com>
Cr-Commit-Position: refs/heads/master@{#49578}

tools/testrunner/local/statusfile.py

@@ -43,18 +43,16 @@ FAST_VARIANTS = "FAST_VARIANTS"
 NO_VARIANTS = "NO_VARIANTS"
 # These are just for the status files and are mapped below in DEFS:
 FAIL_OK = "FAIL_OK"
-PASS_OR_FAIL = "PASS_OR_FAIL" # TODO(majeski): unused in status files
 FAIL_SLOPPY = "FAIL_SLOPPY"
 
 ALWAYS = "ALWAYS"
 
 KEYWORDS = {}
 for key in [SKIP, FAIL, PASS, OKAY, CRASH, SLOW, FAIL_OK,
-            FAST_VARIANTS, NO_VARIANTS, PASS_OR_FAIL, FAIL_SLOPPY, ALWAYS]:
+            FAST_VARIANTS, NO_VARIANTS, FAIL_SLOPPY, ALWAYS]:
   KEYWORDS[key] = key
 
-DEFS = {FAIL_OK: [FAIL, OKAY],
-        PASS_OR_FAIL: [PASS, FAIL]}
+DEFS = {FAIL_OK: [FAIL, OKAY]}
 
 # Support arches, modes to be written as keywords instead of strings.
 VARIABLES = {ALWAYS: True}

tools/testrunner/local/verbose.py

@@ -35,7 +35,6 @@ from . import statusfile
 REPORT_TEMPLATE = (
 """Total: %(total)i tests
  * %(skipped)4d tests will be skipped
- * %(timeout)4d tests are expected to timeout sometimes
  * %(nocrash)4d tests are expected to be flaky but not crash
  * %(pass)4d tests are expected to pass
  * %(fail_ok)4d tests are expected to fail that we won't fix
@@ -44,7 +43,7 @@ REPORT_TEMPLATE = (
 
 def PrintReport(tests):
   total = len(tests)
-  skipped = timeout = nocrash = passes = fail_ok = fail = 0
+  skipped = nocrash = passes = fail_ok = fail = 0
   for t in tests:
     outcomes = t.suite.GetOutcomesForTestCase(t)
     if not outcomes:
@@ -53,8 +52,6 @@ def PrintReport(tests):
     if statusfile.DoSkip(outcomes):
       skipped += 1
       continue
-    if statusfile.TIMEOUT in outcomes:
-      timeout += 1
     if statusfile.IsPassOrFail(outcomes):
       nocrash += 1
     if list(outcomes) == [statusfile.PASS]:
@@ -67,7 +64,6 @@ def PrintReport(tests):
   print REPORT_TEMPLATE % {
     "total": total,
     "skipped": skipped,
-    "timeout": timeout,
     "nocrash": nocrash,
     "pass": passes,
     "fail_ok": fail_ok,