Title: [200956] trunk/Tools
- Revision
- 200956
- Author
- [email protected]
- Date
- 2016-05-16 11:57:28 -0700 (Mon, 16 May 2016)
Log Message
Add machine-readable results for JSC API tests to the Buildbot json log
https://bugs.webkit.org/show_bug.cgi?id=157642
Patch by Srinivasan Vijayaraghavan <[email protected]> on 2016-05-16
Reviewed by Geoffrey Garen.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunJavaScriptCoreTests): Use --no-fail-fast option on run-_javascript_core-tests
* Scripts/run-_javascript_core-tests:
(runJSCStressTests): Abstracted out writing JSON to file (new function below)
(writeJsonDataIfApplicable): Added
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (200955 => 200956)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2016-05-16 18:54:41 UTC (rev 200955)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2016-05-16 18:57:28 UTC (rev 200956)
@@ -299,7 +299,7 @@
description = ["jscore-tests running"]
descriptionDone = ["jscore-tests"]
jsonFileName = "jsc_results.json"
- command = ["perl", "./Tools/Scripts/run-_javascript_core-tests", "--no-build", "--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")]
failedTestsFormatString = "%d JSC test%s failed"
logfiles = {"json": jsonFileName}
Modified: trunk/Tools/ChangeLog (200955 => 200956)
--- trunk/Tools/ChangeLog 2016-05-16 18:54:41 UTC (rev 200955)
+++ trunk/Tools/ChangeLog 2016-05-16 18:57:28 UTC (rev 200956)
@@ -1,3 +1,16 @@
+2016-05-16 Srinivasan Vijayaraghavan <[email protected]>
+
+ Add machine-readable results for JSC API tests to the Buildbot json log
+ https://bugs.webkit.org/show_bug.cgi?id=157642
+
+ Reviewed by Geoffrey Garen.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunJavaScriptCoreTests): Use --no-fail-fast option on run-_javascript_core-tests
+ * Scripts/run-_javascript_core-tests:
+ (runJSCStressTests): Abstracted out writing JSON to file (new function below)
+ (writeJsonDataIfApplicable): Added
+
2016-04-06 Jer Noble <[email protected]>
[WK2] Add API to WKWebViewConfiguration to control autoplay policy.
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (200955 => 200956)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2016-05-16 18:54:41 UTC (rev 200955)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2016-05-16 18:57:28 UTC (rev 200956)
@@ -68,6 +68,7 @@
my $createTarball = 0;
my $remoteHost = 0;
my $failFast = 1;
+my %jsonData = ();
my $remoteConfigFile;
my $jsonFileName;
@@ -207,7 +208,14 @@
my $testapiResult = system { $command[0] } @command;
my $exitStatus = exitStatus($testapiResult);
print "testAPI completed with rc=$testapiResult ($exitStatus)\n";
+
+ if (defined($jsonFileName)) {
+ my $apiStatus = ($exitStatus == 0)? JSON::PP::true: JSON::PP::false;
+ $jsonData{'apiTestResult'} = $apiStatus;
+ }
+
if ($testapiResult && $failFast) {
+ writeJsonDataIfApplicable();
exit exitStatus($testapiResult);
}
}
@@ -337,15 +345,10 @@
print "\n";
if (defined($jsonFileName)) {
- my %jsonData = (
- "failures" => \@jscStressFailList,
- );
-
- open(my $fileHandler, ">", $jsonFileName) or die;
- print $fileHandler "${\encode_json(\%jsonData)}\n";
- close($fileHandler);
+ $jsonData{'failures'} = \@jscStressFailList;
}
+ writeJsonDataIfApplicable();
exit(1) if $numJSCStressFailures;
}
@@ -375,3 +378,12 @@
}
print " $verb.\n";
}
+
+sub writeJsonDataIfApplicable
+{
+ if (defined($jsonFileName)) {
+ open(my $fileHandler, ">", $jsonFileName) or die;
+ print $fileHandler "${\encode_json(\%jsonData)}\n";
+ close($fileHandler);
+ }
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
