1 files changed, 6 insertions, 9 deletions
diff --git a/deps/v8/tools/testrunner/local/progress.py b/deps/v8/tools/testrunner/local/progress.py
index 6321cadece..e57a6e36c9 100644
--- a/deps/v8/tools/testrunner/local/progress.py
+++ b/deps/v8/tools/testrunner/local/progress.py
@@ -71,7 +71,7 @@ class ProgressIndicator(object):
     }
 
   def _EscapeCommand(self, test):
-    command = execution.GetCommand(test, self.runner.context)
+    command, _ = execution.GetCommand(test, self.runner.context)
     parts = []
     for part in command:
       if ' ' in part:
@@ -336,7 +336,8 @@ class JsonTestProgressIndicator(ProgressIndicator):
         "flags": test.flags,
         "command": self._EscapeCommand(test).replace(ABS_PATH_PREFIX, ""),
         "duration": test.duration,
-        "marked_slow": statusfile.IsSlow(test.outcomes),
+        "marked_slow": statusfile.IsSlow(
+          test.suite.GetStatusFileOutcomes(test)),
       } for test in timed_tests[:20]
     ]
 
@@ -369,13 +370,13 @@ class JsonTestProgressIndicator(ProgressIndicator):
       "stderr": test.output.stderr,
       "exit_code": test.output.exit_code,
       "result": test.suite.GetOutcome(test),
-      "expected": list(test.outcomes or ["PASS"]),
+      "expected": test.suite.GetExpectedOutcomes(test),
       "duration": test.duration,
 
       # TODO(machenbach): This stores only the global random seed from the
       # context and not possible overrides when using random-seed stress.
       "random_seed": self.random_seed,
-      "target_name": test.suite.shell(),
+      "target_name": test.suite.GetShellForTestCase(test),
       "variant": test.variant,
     })
 
@@ -414,11 +415,7 @@ class FlakinessTestProgressIndicator(ProgressIndicator):
     assert outcome in ["PASS", "FAIL", "CRASH", "TIMEOUT"]
     if test.run == 1:
       # First run of this test.
-      expected_outcomes = ([
-        expected
-        for expected in (test.outcomes or ["PASS"])
-        if expected in ["PASS", "FAIL", "CRASH", "TIMEOUT"]
-      ] or ["PASS"])
+      expected_outcomes = test.suite.GetExpectedOutcomes(test)
       self.results[key] = {
         "actual": outcome,
         "expected": " ".join(expected_outcomes),