[webkit-changes] [252648] trunk/Tools

Tue, 19 Nov 2019 14:07:53 -0800

Title: [252648] trunk/Tools
Revision
252648
Author
[email protected]
Date
2019-11-19 14:06:43 -0800 (Tue, 19 Nov 2019)

Log Message

results.webkit.org: Have build.webkit.org report JSC tests
https://bugs.webkit.org/show_bug.cgi?id=204364

Reviewed by Aakash Jain.

* BuildSlaveSupport/build.webkit.org-config/steps.py:
(RunJavaScriptCoreTests):
(RunWebKitTests):
(RunAPITests):
(RunPythonTests):
(RunLLINTCLoopTests):
(Run32bitJSCTests):

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (252647 => 252648)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py	2019-11-19 22:05:12 UTC (rev 252647)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py	2019-11-19 22:06:43 UTC (rev 252648)
@@ -28,6 +28,7 @@
 
 import os
 import re
+import socket
 import json
 import cStringIO
 import urllib
@@ -35,8 +36,9 @@
 APPLE_WEBKIT_AWS_PROXY = "http://proxy01.webkit.org:3128"
 S3URL = "https://s3-us-west-2.amazonaws.com/"
 WithProperties = properties.WithProperties
-RESULTS_WEBKIT = 'https://results.webkit.org'
+RESULTS_WEBKIT_URL = 'https://results.webkit.org'
 RESULTS_SERVER_API_KEY = 'RESULTS_SERVER_API_KEY'
+BUILD_WEBKIT_URL = socket.gethostname().strip()
 
 
 class TestWithFailureCount(shell.Test):
@@ -341,7 +343,17 @@
     description = ["jscore-tests running"]
     descriptionDone = ["jscore-tests"]
     jsonFileName = "jsc_results.json"
-    command = ["perl", "./Tools/Scripts/run-_javascript_core-tests", "--no-build", "--no-fail-fast", "--json-output={0}".format(jsonFileName), WithProperties("--%(configuration)s")]
+    command = [
+        "perl", "./Tools/Scripts/run-_javascript_core-tests",
+        "--no-build", "--no-fail-fast",
+        "--json-output={0}".format(jsonFileName),
+        WithProperties("--%(configuration)s"),
+        "--builder-name", WithProperties("%(buildername)s"),
+        "--build-number", WithProperties("%(buildnumber)s"),
+        "--buildbot-worker", WithProperties("%(slavename)s"),
+        "--buildbot-master", BUILD_WEBKIT_URL,
+        "--report", RESULTS_WEBKIT_URL,
+    ]
     failedTestsFormatString = "%d JSC test%s failed"
     logfiles = {"json": jsonFileName}
 
@@ -420,8 +432,8 @@
                "--build-number", WithProperties("%(buildnumber)s"),
                "--buildbot-worker", WithProperties("%(slavename)s"),
                "--master-name", "webkit.org",
-               "--buildbot-master", "build.webkit.org",
-               "--report", RESULTS_WEBKIT,
+               "--buildbot-master", BUILD_WEBKIT_URL,
+               "--report", RESULTS_WEBKIT_URL,
                "--test-results-server", "webkit-test-results.webkit.org",
                "--exit-after-n-crashes-or-timeouts", "50",
                "--exit-after-n-failures", "500",
@@ -550,11 +562,11 @@
         "--json-output={0}".format(jsonFileName),
         WithProperties("--%(configuration)s"),
         "--verbose",
-        "--buildbot-master", "build.webkit.org",
+        "--buildbot-master", BUILD_WEBKIT_URL,
         "--builder-name", WithProperties("%(buildername)s"),
         "--build-number", WithProperties("%(buildnumber)s"),
         "--buildbot-worker", WithProperties("%(slavename)s"),
-        "--report", RESULTS_WEBKIT,
+        "--report", RESULTS_WEBKIT_URL,
     ]
     failedTestsFormatString = "%d api test%s failed or timed out"
 
@@ -585,11 +597,11 @@
         "./Tools/Scripts/test-webkitpy",
         "--verbose",
         WithProperties("--%(configuration)s"),
-        "--buildbot-master", "build.webkit.org",
+        "--buildbot-master", BUILD_WEBKIT_URL,
         "--builder-name", WithProperties("%(buildername)s"),
         "--build-number", WithProperties("%(buildnumber)s"),
         "--buildbot-worker", WithProperties("%(slavename)s"),
-        "--report", RESULTS_WEBKIT,
+        "--report", RESULTS_WEBKIT_URL,
     ]
     failedTestsFormatString = "%d python test%s failed"
 
@@ -647,7 +659,18 @@
     description = ["cloop-tests running"]
     descriptionDone = ["cloop-tests"]
     jsonFileName = "jsc_cloop.json"
-    command = ["perl", "./Tools/Scripts/run-_javascript_core-tests", "--cloop", "--no-build", "--no-jsc-stress", "--no-fail-fast", "--json-output={0}".format(jsonFileName), WithProperties("--%(configuration)s")]
+    command = [
+        "perl", "./Tools/Scripts/run-_javascript_core-tests",
+        "--cloop", "--no-build",
+        "--no-jsc-stress", "--no-fail-fast",
+        "--json-output={0}".format(jsonFileName),
+        WithProperties("--%(configuration)s"),
+        "--builder-name", WithProperties("%(buildername)s"),
+        "--build-number", WithProperties("%(buildnumber)s"),
+        "--buildbot-worker", WithProperties("%(slavename)s"),
+        "--buildbot-master", BUILD_WEBKIT_URL,
+        "--report", RESULTS_WEBKIT_URL,
+    ]
     failedTestsFormatString = "%d regression%s found."
     logfiles = {"json": jsonFileName}
 
@@ -668,7 +691,18 @@
     description = ["32bit-jsc-tests running"]
     descriptionDone = ["32bit-jsc-tests"]
     jsonFileName = "jsc_32bit.json"
-    command = ["perl", "./Tools/Scripts/run-_javascript_core-tests", "--32-bit", "--no-build", "--no-fail-fast", "--no-jit", "--no-testair", "--no-testb3", "--no-testmasm", "--json-output={0}".format(jsonFileName), WithProperties("--%(configuration)s")]
+    command = [
+        "perl", "./Tools/Scripts/run-_javascript_core-tests",
+        "--32-bit", "--no-build",
+        "--no-fail-fast", "--no-jit", "--no-testair", "--no-testb3", "--no-testmasm",
+        "--json-output={0}".format(jsonFileName),
+        WithProperties("--%(configuration)s"),
+        "--builder-name", WithProperties("%(buildername)s"),
+        "--build-number", WithProperties("%(buildnumber)s"),
+        "--buildbot-worker", WithProperties("%(slavename)s"),
+        "--buildbot-master", BUILD_WEBKIT_URL,
+        "--report", RESULTS_WEBKIT_URL,
+    ]
     failedTestsFormatString = "%d regression%s found."
     logfiles = {"json": jsonFileName}

Modified: trunk/Tools/ChangeLog (252647 => 252648)


--- trunk/Tools/ChangeLog	2019-11-19 22:05:12 UTC (rev 252647)
+++ trunk/Tools/ChangeLog	2019-11-19 22:06:43 UTC (rev 252648)
@@ -1,3 +1,18 @@
+2019-11-19  Jonathan Bedard  <[email protected]>
+
+        results.webkit.org: Have build.webkit.org report JSC tests
+        https://bugs.webkit.org/show_bug.cgi?id=204364
+
+        Reviewed by Aakash Jain.
+
+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
+        (RunJavaScriptCoreTests):
+        (RunWebKitTests):
+        (RunAPITests):
+        (RunPythonTests):
+        (RunLLINTCLoopTests):
+        (Run32bitJSCTests):
+
 2019-11-19  Aakash Jain  <[email protected]>
 
         Disable reporting EWS test failures from clean-tree to results.webkit.org

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to