Changeset 247428 in webkit

Timestamp:

Jul 15, 2019 4:58:53 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r247393.
​https://bugs.webkit.org/show_bug.cgi?id=199797

broke mips and arm EWS (Requested by guijemont on #webkit).

Reverted changeset:

"run-javascriptcore-tests won't report test results for
testmasm, testair, testb3, testdfg and test api"
​https://bugs.webkit.org/show_bug.cgi?id=199489
​https://trac.webkit.org/changeset/247393

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/steps.py (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (5 diffs)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py

@@ -332 +332 @@
     def start(self):
         platform = self.getProperty('platform')
-        architecture = self.getProperty("architecture")
-        # Currently run-javascriptcore-test doesn't support run those binaries remotely
-        if architecture in ['mips', 'armv7', 'aarch64']:
-            self.command += ['--no-testmasm', '--no-testair', '--no-testb3', '--no-testdfg', '--no-testapi']
         # Linux bots have currently problems with JSC tests that try to use large amounts of memory.
         # Check: https://bugs.webkit.org/show_bug.cgi?id=175140
@@ -349 +345 @@
     def countFailures(self, cmd):
         logText = cmd.logs['stdio'].getText()
-        count = 0
 
         match = re.search(r'^Results for JSC stress tests:\r?\n\s+(\d+) failure', logText, re.MULTILINE)
         if match:
-            count += int(match.group(1))
-
-        match = re.search(r'Results for JSC test binaries:\r?\n\s+(\d+) failure', logText, re.MULTILINE)
-        if match:
-            count += int(match.group(1))
+            return int(match.group(1))
 
         match = re.search(r'^Results for Mozilla tests:\r?\n\s+(\d+) regression', logText, re.MULTILINE)
         if match:
-            count += int(match.group(1))
-
-        return count
+            return int(match.group(1))
+
+        return 0
 
 

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py

@@ -123 +123 @@
     5 failures found.""")
 
-    def test_jsc_stress_failures_with_binary_results_output(self):
-        self.assertResults(FAILURE, ["8 JSC tests failed"], 1,  """Results for JSC stress tests:
-    5 failures found.
-Results for JSC test binaries:
-    3 failures found.""")
-
-    def test_jsc_stress_failures_with_binary_result_output(self):
-        self.assertResults(FAILURE, ["6 JSC tests failed"], 1,  """Results for JSC stress tests:
-    5 failures found.
-Results for JSC test binaries:
-    1 failure found.""")
-
 
 class RunTest262TestsTest(unittest.TestCase):

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-15  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r247393.
+        https://bugs.webkit.org/show_bug.cgi?id=199797
+
+        broke mips and arm EWS (Requested by guijemont on #webkit).
+
+        Reverted changeset:
+
+        "run-javascriptcore-tests won't report test results for
+        testmasm, testair, testb3, testdfg and test api"
+        https://bugs.webkit.org/show_bug.cgi?id=199489
+        https://trac.webkit.org/changeset/247393
+
 2019-07-12  Andy Estes  <aestes@apple.com>
 

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -93 +93 @@
 my $failFast = 1;
 my %jsonData = ();
-my @testResults = ();
-my $isTestFailed = 0;
 my $remoteConfigFile;
 my $jsonFileName;
@@ -401 +399 @@
     print "$testName completed with rc=$testResult ($exitStatus)\n\n";
 
-    my $testStatus = ($exitStatus == 0)? JSON::PP::true: JSON::PP::false;
-    if ($testResult) {
-        $isTestFailed = 1;
-        push @testResults, $testName;
-    }
     if (defined($jsonFileName)) {
+        my $testStatus = ($exitStatus == 0)? JSON::PP::true: JSON::PP::false;
         $jsonData{$jsonTestStatusName} = $testStatus;
     }
 
     if ($testResult && $failFast) {
-        reportTestFailures();
         writeJsonDataIfApplicable();
         exit exitStatus($testResult);
     }
-}
-
-sub reportTestFailures {
-  my $numJSCtestFailures = @testResults;
-  if ($numJSCtestFailures) {
-      print "\n** The following JSC test binaries failures have been introduced:\n";
-      foreach my $testFailure (@testResults) {
-          print "\t$testFailure\n";
-      }
-  }
-  print "\n";
-
-  print "Results for JSC test binaries:\n";
-  printThingsFound($numJSCtestFailures, "failure", "failures", "found");
-  print "    OK.\n" if $numJSCtestFailures == 0;
-
-  print "\n";
 }
 
@@ -445 +421 @@
 
 runJSCStressTests();
-reportTestFailures();
-
-if ($isTestFailed) {
-  exit(1);
-}
 
 sub runJSCStressTests
@@ -603 +574 @@
 
     if ($numJSCStressFailures) {
-        $isTestFailed = 1;
         print "\n** The following JSC stress test failures have been introduced:\n";
         foreach my $testFailure (@jscStressFailList) {
@@ -622 +592 @@
 
     writeJsonDataIfApplicable();
+    exit(1) if $numJSCStressFailures;
 }