Attachment 373779 Details for Bug 199489 – Patch

[patch] Patch

bug-199489-20190709152358.patch (text/plain), 5.69 KB, created by Zhifei Fang on 2019-07-09 15:23:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zhifei Fang

Created: 2019-07-09 15:23:59 PDT

Size: 5.69 KB

patch

obsolete

>Subversion Revision: 247229
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 583e45837387ddea6d1cc0a39a5a9cf31f3a2eb0..ae2fbe727491cc3df721985baaeafa2780efd49b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-07-09  Zhifei Fang  <zhifei_fang@apple.com>
>+
>+        run-javascript-core-test won't report json results for testmasm, testair, testb3, testdfg and test api
>+        https://bugs.webkit.org/show_bug.cgi?id=199489
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
>+        (RunJavaScriptCoreTests.countFailures):
>+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
>+        * Scripts/run-javascriptcore-tests:
>+        (runTest):
>+        (reportTestFailures):
>+        (runJSCStressTests):
>+
> 2019-07-08  Jonathan Bedard  <jbedard@apple.com>
> 
>         test-webkitpy: Explicitly use Python 2.7 lldb library
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>index c27d262df9c9e8e7fbf174af41e7449af60755e6..cdafd3abde2f2bb06d59485823da799e9c44c54a 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>@@ -344,16 +344,21 @@ class RunJavaScriptCoreTests(TestWithFailureCount):
> 
>     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:
>-            return int(match.group(1))
>+            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))
> 
>         match = re.search(r'^Results for Mozilla tests:\r?\n\s+(\d+) regression', logText, re.MULTILINE)
>         if match:
>             return int(match.group(1))
> 
>-        return 0
>+        return count
> 
> 
> class RunRemoteJavaScriptCoreTests(RunJavaScriptCoreTests):
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py b/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>index 4f875d3ea0d03ac22e554b355f9022147472e83f..65315bde5788dd566860613b070b8d58874216bb 100755
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>@@ -122,6 +122,18 @@ class RunJavaScriptCoreTestsTest(unittest.TestCase):
>         self.assertResults(FAILURE, ["5 JSC tests failed"], 1,  """Results for JSC stress tests:
>     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):
>     def assertResults(self, expected_result, expected_text, rc, stdio):
>diff --git a/Tools/Scripts/run-javascriptcore-tests b/Tools/Scripts/run-javascriptcore-tests
>index cfe61a277418d19b07640f05deec57af548c980f..2b8ab0256f49649712960f2e715d096a60c20e5c 100755
>--- a/Tools/Scripts/run-javascriptcore-tests
>+++ b/Tools/Scripts/run-javascriptcore-tests
>@@ -92,6 +92,8 @@ my $createTarball = 0;
> my $remoteHost = 0;
> my $failFast = 1;
> my %jsonData = ();
>+my @testResults = ();
>+my $isTestFailed = 0;
> my $remoteConfigFile;
> my $jsonFileName;
> my $verbose = 0;
>@@ -398,17 +400,39 @@ sub runTest {
>     my $exitStatus = exitStatus($testResult);
>     print "$testName completed with rc=$testResult ($exitStatus)\n\n";
> 
>+    my $testStatus = ($exitStatus == 0)? JSON::PP::true: JSON::PP::false;
>+    if ($exitStatus) {
>+        $isTestFailed = 1;
>+    }
>     if (defined($jsonFileName)) {
>-        my $testStatus = ($exitStatus == 0)? JSON::PP::true: JSON::PP::false;
>         $jsonData{$jsonTestStatusName} = $testStatus;
>     }
>+    push @testResults, $testName;
> 
>     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";
>+}
>+
> if ($runTestMasm) { runTest("testmasm", "allMasmTestsPassed") }
> if ($runTestAir) { runTest("testair", "allAirTestsPassed") }
> if ($runTestB3) { runTest("testb3", "allB3TestsPassed") }
>@@ -420,6 +444,11 @@ if ($runTestAPI) { runTest("testapi", "allApiTestsPassed") }
> chdirWebKit();
> 
> runJSCStressTests();
>+reportTestFailures();
>+
>+if ($isTestFailed) {
>+  exit(1);
>+}
> 
> sub runJSCStressTests
> {
>@@ -573,6 +602,7 @@ sub runJSCStressTests
>     my $numJSCStressFailures = @jscStressFailList;
> 
>     if ($numJSCStressFailures) {
>+        $isTestFailed = 1;
>         print "\n** The following JSC stress test failures have been introduced:\n";
>         foreach my $testFailure (@jscStressFailList) {
>             print "\t$testFailure\n";
>@@ -591,7 +621,6 @@ sub runJSCStressTests
>     }
> 
>     writeJsonDataIfApplicable();
>-    exit(1) if $numJSCStressFailures;
> }
> 
> sub readAllLines

Actions: View | Formatted Diff | Diff

Attachments on bug 199489: 373451 | 373665 | 373779 | 373850 | 373866 | 373956 | 374024 | 374026 | 374251 | 374306 | 374307 | 374627 | 374690 | 374738