Unreviewed, rolling out r199916.
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Apr 2016 19:43:55 +0000 (19:43 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Apr 2016 19:43:55 +0000 (19:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=156989

Might break buildbot when master is restarted (Requested by
Srinivasan Vijayaraghava, Guest100, on #webkit).

Reverted changeset:

"Add JSC test results in json format to a buildbot log"
https://bugs.webkit.org/show_bug.cgi?id=156920
http://trac.webkit.org/changeset/199916

Patch by Commit Queue <commit-queue@webkit.org> on 2016-04-25

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@200040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
Tools/ChangeLog
Tools/Scripts/run-javascriptcore-tests

index 2f8edb1..b1b602b 100644 (file)
@@ -44,7 +44,7 @@ authz = Authz(
 
 c['status'] = []
 c['status'].append(html.WebStatus(http_port=8710,
-                                  revlink="https://trac.webkit.org/changeset/%s",
+                                  revlink="https://trac.webkit.org/changeset/%s", 
                                   changecommentlink=(r"(https://bugs\.webkit\.org/show_bug\.cgi\?id=|webkit\.org/b/)(\d+)", r"https://bugs.webkit.org/show_bug.cgi?id=\2"),
                                   authz=authz))
 
@@ -228,7 +228,7 @@ class CompileWebKit(shell.Compile):
 
     def createSummary(self, log):
         platform = self.getProperty('platform')
-        if platform.startswith('mac'):
+        if platform.startswith('mac'):    
             warnings = []
             errors = []
             sio = cStringIO.StringIO(log.getText())
@@ -298,10 +298,8 @@ class RunJavaScriptCoreTests(TestWithFailureCount):
     name = "jscore-test"
     description = ["jscore-tests running"]
     descriptionDone = ["jscore-tests"]
-    _jsonFileName = "jsc_test_failures.json"
-    command = ["perl", "./Tools/Scripts/run-javascriptcore-tests", "--no-build", WithProperties("--%(configuration)s", "--json-output=%(_jsonFileName)s")]
+    command = ["perl", "./Tools/Scripts/run-javascriptcore-tests", "--no-build", WithProperties("--%(configuration)s")]
     failedTestsFormatString = "%d JSC test%s failed"
-    logfiles = {"json": _jsonFileName}
 
     def start(self):
         appendCustomBuildFlags(self, self.getProperty('platform'), self.getProperty('fullPlatform'))
index 8a94ec5..09f52b0 100644 (file)
@@ -1,3 +1,17 @@
+2016-04-25  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r199916.
+        https://bugs.webkit.org/show_bug.cgi?id=156989
+
+        Might break buildbot when master is restarted (Requested by
+        Srinivasan Vijayaraghava, Guest100, on #webkit).
+
+        Reverted changeset:
+
+        "Add JSC test results in json format to a buildbot log"
+        https://bugs.webkit.org/show_bug.cgi?id=156920
+        http://trac.webkit.org/changeset/199916
+
 2016-04-23  Chris Dumez  <cdumez@apple.com>
 
         [WebIDL] Drop [Default] WebKit-IDL extended attribute
index 480c92e..9dcc68e 100755 (executable)
@@ -332,7 +332,8 @@ sub runJSCStressTests
 
     if (defined($jsonFileName)) {
         my %jsonData = (
-            "failures" => \@jscStressFailList,
+            "numJSCStressFailures" => $numJSCStressFailures,
+            "jscStressFailList" => \@jscStressFailList,
         );
 
         open(my $fileHandler, ">", $jsonFileName) or die;