<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198807] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198807">198807</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-29 15:23:42 -0700 (Tue, 29 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add machine-readable results for JSC stress tests
https://bugs.webkit.org/show_bug.cgi?id=155771
Patch by Srinivasan Vijayaraghavan <svijayaraghavan@apple.com> on 2016-03-29
Reviewed by Darin Adler and Dean Johnson
Add an option to output JSC stress test results to a user-specified file in JSON format.
* Scripts/run-javascriptcore-tests:
(runJSCStressTests): Add JSON output support
(readAllLines): Remove trailing newline from the end of each item</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjavascriptcoretests">trunk/Tools/Scripts/run-javascriptcore-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198806 => 198807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-29 22:19:40 UTC (rev 198806)
+++ trunk/Tools/ChangeLog 2016-03-29 22:23:42 UTC (rev 198807)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-29 Srinivasan Vijayaraghavan <svijayaraghavan@apple.com>
+
+ Add machine-readable results for JSC stress tests
+ https://bugs.webkit.org/show_bug.cgi?id=155771
+
+ Reviewed by Darin Adler and Dean Johnson
+
+ Add an option to output JSC stress test results to a user-specified file in JSON format.
+
+ * Scripts/run-javascriptcore-tests:
+ (runJSCStressTests): Add JSON output support
+ (readAllLines): Remove trailing newline from the end of each item
+
</ins><span class="cx"> 2016-03-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix Windows build.
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (198806 => 198807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests 2016-03-29 22:19:40 UTC (rev 198806)
+++ trunk/Tools/Scripts/run-javascriptcore-tests 2016-03-29 22:23:42 UTC (rev 198807)
</span><span class="lines">@@ -31,12 +31,14 @@
</span><span class="cx"> # as well as other tests: testapi on Mac and LayoutTests/js.
</span><span class="cx">
</span><span class="cx"> use strict;
</span><ins>+use File::Spec;
</ins><span class="cx"> use FindBin;
</span><span class="cx"> use Getopt::Long qw(:config pass_through);
</span><ins>+use JSON::PP;
+use lib $FindBin::Bin;
</ins><span class="cx"> use List::Util qw(min max);
</span><del>-use lib $FindBin::Bin;
</del><ins>+use POSIX;
</ins><span class="cx"> use webkitdirs;
</span><del>-use POSIX;
</del><span class="cx">
</span><span class="cx"> # determine configuration
</span><span class="cx"> setConfiguration();
</span><span class="lines">@@ -66,6 +68,7 @@
</span><span class="cx"> my $createTarball = 0;
</span><span class="cx"> my $remoteHost = 0;
</span><span class="cx"> my $remoteConfigFile;
</span><ins>+my $jsonFileName;
</ins><span class="cx">
</span><span class="cx"> my $programName = basename($0);
</span><span class="cx"> my $buildJSCDefault = $buildJSC ? "will check" : "will not check";
</span><span class="lines">@@ -87,6 +90,7 @@
</span><span class="cx"> If the runner only runs some it will run the default and no-cjit-validate modes.
</span><span class="cx"> Note, this will not change the behavior of tests that specify their own modes.
</span><span class="cx">
</span><ins>+ --json-output= Create a file at specified path, listing failed stress tests in JSON format.
</ins><span class="cx"> --tarball Create a tarball of the bundle produced by running the JSC stress tests.
</span><span class="cx"> --remote= Run the JSC stress tests on the specified remote host. Implies --tarball.
</span><span class="cx"> --remote-config-file= Same as remote, but read config from JSON file.
</span><span class="lines">@@ -112,6 +116,7 @@
</span><span class="cx"> 'jsc-stress!' => \$runJSCStress,
</span><span class="cx"> 'jit-stress-tests!' => \$runJITStressTests,
</span><span class="cx"> 'quick!' => \$runQuickMode,
</span><ins>+ 'json-output=s' => \$jsonFileName,
</ins><span class="cx"> 'tarball!' => \$createTarball,
</span><span class="cx"> 'remote=s' => \$remoteHost,
</span><span class="cx"> 'remote-config-file=s' => \$remoteConfigFile,
</span><span class="lines">@@ -121,7 +126,7 @@
</span><span class="cx"> 'filter=s' => \$filter,
</span><span class="cx"> 'help' => \$showHelp,
</span><span class="cx"> 'env-vars=s' => \$envVars,
</span><del>- 'gmalloc:s' => \$gmallocPath
</del><ins>+ 'gmalloc:s' => \$gmallocPath,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> # Assume any arguments left over from GetOptions are assumed to be build arguments
</span><span class="lines">@@ -139,6 +144,10 @@
</span><span class="cx">
</span><span class="cx"> setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
</span><span class="cx">
</span><ins>+if (defined($jsonFileName)) {
+ $jsonFileName = File::Spec->rel2abs($jsonFileName);
+}
+
</ins><span class="cx"> if (!defined($root) && $buildJSC) {
</span><span class="cx"> chdirWebKit();
</span><span class="cx">
</span><span class="lines">@@ -283,7 +292,7 @@
</span><span class="cx"> if ($makeRunner) {
</span><span class="cx"> push(@jscStressDriverCmd, "--make-runner");
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($filter) {
</span><span class="cx"> push(@jscStressDriverCmd, "--filter");
</span><span class="cx"> push(@jscStressDriverCmd, $filter);
</span><span class="lines">@@ -309,7 +318,7 @@
</span><span class="cx"> if ($numJSCStressFailures) {
</span><span class="cx"> print "\n** The following JSC stress test failures have been introduced:\n";
</span><span class="cx"> foreach my $testFailure (@jscStressFailList) {
</span><del>- print "\t$testFailure";
</del><ins>+ print "\t$testFailure\n";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> print "\n";
</span><span class="lines">@@ -320,6 +329,17 @@
</span><span class="cx">
</span><span class="cx"> print "\n";
</span><span class="cx">
</span><ins>+ if (defined($jsonFileName)) {
+ my %jsonData = (
+ "numJSCStressFailures" => $numJSCStressFailures,
+ "jscStressFailList" => \@jscStressFailList,
+ );
+
+ open(my $fileHandler, ">", $jsonFileName) or die;
+ print $fileHandler "${\encode_json(\%jsonData)}\n";
+ close($fileHandler);
+ }
+
</ins><span class="cx"> exit(1) if $numJSCStressFailures;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -330,6 +350,7 @@
</span><span class="cx"> eval {
</span><span class="cx"> open FILE, $filename or die;
</span><span class="cx"> while (<FILE>) {
</span><ins>+ chomp;
</ins><span class="cx"> push @array, $_;
</span><span class="cx"> }
</span><span class="cx"> close FILE;
</span></span></pre>
</div>
</div>
</body>
</html>