<!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>[179986] 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/179986">179986</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-12 08:08:04 -0800 (Thu, 12 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-jsc-stress-tests should accept remote host config from JSON file
https://bugs.webkit.org/show_bug.cgi?id=141509
Reviewed by Michael Saboff.
* Scripts/run-javascriptcore-tests:
(runJSCStressTests):
* Scripts/run-jsc-stress-tests:</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>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179985 => 179986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-02-12 14:25:30 UTC (rev 179985)
+++ trunk/Tools/ChangeLog        2015-02-12 16:08:04 UTC (rev 179986)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-02-12 Csaba Osztrogonác <ossy@webkit.org>
+
+ run-jsc-stress-tests should accept remote host config from JSON file
+ https://bugs.webkit.org/show_bug.cgi?id=141509
+
+ Reviewed by Michael Saboff.
+
+ * Scripts/run-javascriptcore-tests:
+ (runJSCStressTests):
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2015-02-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add API to allow overriding the default color chooser implementation
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (179985 => 179986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests        2015-02-12 14:25:30 UTC (rev 179985)
+++ trunk/Tools/Scripts/run-javascriptcore-tests        2015-02-12 16:08:04 UTC (rev 179986)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> my $enableFTL = isAppleMacWebKit();
</span><span class="cx"> my $createTarball = 0;
</span><span class="cx"> my $remoteHost = 0;
</span><ins>+my $remoteConfigFile;
</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">@@ -82,6 +83,7 @@
</span><span class="cx"> ----------------------------------------------
</span><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><ins>+ --remote-config-file= Same as remote, but read config from JSON file.
</ins><span class="cx"> --extra-tests= Path to a file containing extra tests
</span><span class="cx"> --child-processes= Specify the number of child processes.
</span><span class="cx"> --shell-runner Uses the shell-based test runner instead of the default make-based runner.
</span><span class="lines">@@ -100,6 +102,7 @@
</span><span class="cx"> 'jsc-stress!' => \$runJSCStress,
</span><span class="cx"> 'tarball!' => \$createTarball,
</span><span class="cx"> 'remote=s' => \$remoteHost,
</span><ins>+ 'remote-config-file=s' => \$remoteConfigFile,
</ins><span class="cx"> 'child-processes=s' => \$childProcesses,
</span><span class="cx"> 'shell-runner' => \$shellRunner,
</span><span class="cx"> 'make-runner' => \$makeRunner,
</span><span class="lines">@@ -283,11 +286,17 @@
</span><span class="cx"> if ($createTarball) {
</span><span class="cx"> push(@jscStressDriverCmd, "--tarball");
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if ($remoteHost) {
</span><span class="cx"> push(@jscStressDriverCmd, "--remote");
</span><span class="cx"> push(@jscStressDriverCmd, $remoteHost);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ($remoteConfigFile) {
+ push(@jscStressDriverCmd, "--remote-config-file");
+ push(@jscStressDriverCmd, $remoteConfigFile);
+ }
+
</ins><span class="cx"> if ($childProcesses) {
</span><span class="cx"> push(@jscStressDriverCmd, "--child-processes");
</span><span class="cx"> push(@jscStressDriverCmd, $childProcesses);
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (179985 => 179986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests        2015-02-12 14:25:30 UTC (rev 179985)
+++ trunk/Tools/Scripts/run-jsc-stress-tests        2015-02-12 16:08:04 UTC (rev 179986)
</span><span class="lines">@@ -127,7 +127,8 @@
</span><span class="cx"> puts "--shell-runner Uses the shell-based test runner instead of the default make-based runner."
</span><span class="cx"> puts " In general the shell runner is slower than the make runner."
</span><span class="cx"> puts "--make-runner Uses the faster make-based runner."
</span><del>- puts "--remote Specify a remote host on which to run tests."
</del><ins>+ puts "--remote Specify a remote host on which to run tests from command line argument."
+ puts "--remote-config-file Specify a remote host on which to run tests from JSON file."
</ins><span class="cx"> puts "--child-processes (-c) Specify the number of child processes."
</span><span class="cx"> puts "--help (-h) Print this message."
</span><span class="cx"> exit 1
</span><span class="lines">@@ -149,6 +150,7 @@
</span><span class="cx"> ['--shell-runner', GetoptLong::NO_ARGUMENT],
</span><span class="cx"> ['--make-runner', GetoptLong::NO_ARGUMENT],
</span><span class="cx"> ['--remote', GetoptLong::REQUIRED_ARGUMENT],
</span><ins>+ ['--remote-config-file', GetoptLong::REQUIRED_ARGUMENT],
</ins><span class="cx"> ['--child-processes', '-c', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--verbose', '-v', GetoptLong::NO_ARGUMENT]).each {
</span><span class="cx"> | opt, arg |
</span><span class="lines">@@ -185,6 +187,8 @@
</span><span class="cx"> $remote = true
</span><span class="cx"> uri = URI("ssh://" + arg)
</span><span class="cx"> $remoteUser, $remoteHost, $remotePort = uri.user, uri.host, uri.port
</span><ins>+ when '--remote-config-file'
+ $remoteConfigFile = arg
</ins><span class="cx"> when '--child-processes'
</span><span class="cx"> $numChildProcesses = arg.to_i
</span><span class="cx"> when '--arch'
</span><span class="lines">@@ -194,6 +198,23 @@
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if $remoteConfigFile
+ file = File.read($remoteConfigFile)
+ config = JSON.parse(file)
+
+ if !$remote and config['remote']
+ $copyVM = true
+ $tarball = true
+ $remote = true
+ uri = URI("ssh://" + config['remote'])
+ $remoteUser, $remoteHost, $remotePort = uri.user, uri.host, uri.port
+ end
+
+ if config['remoteDirectory']
+ $remoteDirectory = config['remoteDirectory']
+ end
+end
+
</ins><span class="cx"> unless jscArg
</span><span class="cx"> $stderr.puts "Error: must specify -jsc <path>"
</span><span class="cx"> exit 1
</span><span class="lines">@@ -1378,7 +1399,9 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> if $remote
</span><del>- $remoteDirectory = JSON::parse(sshRead("cat ~/.bencher"))["tempPath"]
</del><ins>+ if !$remoteDirectory
+ $remoteDirectory = JSON::parse(sshRead("cat ~/.bencher"))["tempPath"]
+ end
</ins><span class="cx"> mysys("ssh", "-p", $remotePort.to_s, "#{$remoteUser}@#{$remoteHost}", "mkdir -p #{$remoteDirectory}")
</span><span class="cx"> mysys("scp", "-P", $remotePort.to_s, ($outputDir.dirname + $tarFileName).to_s, "#{$remoteUser}@#{$remoteHost}:#{$remoteDirectory}")
</span><span class="cx"> remoteScript = "\""
</span></span></pre>
</div>
</div>
</body>
</html>