<!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>[179946] 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/179946">179946</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-11 12:31:24 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make run-jsc-stress-tests --remote work with make-based runner
https://bugs.webkit.org/show_bug.cgi?id=141079
Reviewed by Darin Adler.
* Scripts/run-javascriptcore-tests:
(runJSCStressTests): Pass through the --shell-runner and --make-runner arguments.
* Scripts/run-jsc-stress-tests: Made the make-based runner the default runner,
except for remote testing on Darwin. Unified runShellTestRunner and runMakeTestRunner
to avoid code duplication.</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 (179945 => 179946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-11 20:29:32 UTC (rev 179945)
+++ trunk/Tools/ChangeLog 2015-02-11 20:31:24 UTC (rev 179946)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-02-11 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><ins>+ Make run-jsc-stress-tests --remote work with make-based runner
+ https://bugs.webkit.org/show_bug.cgi?id=141079
+
+ Reviewed by Darin Adler.
+
+ * Scripts/run-javascriptcore-tests:
+ (runJSCStressTests): Pass through the --shell-runner and --make-runner arguments.
+ * Scripts/run-jsc-stress-tests: Made the make-based runner the default runner,
+ except for remote testing on Darwin. Unified runShellTestRunner and runMakeTestRunner
+ to avoid code duplication.
+
+2015-02-11 Csaba Osztrogonác <ossy@webkit.org>
+
</ins><span class="cx"> run-jsc-stress tests should detect the number of processors on the remote machine too
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141196
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (179945 => 179946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests 2015-02-11 20:29:32 UTC (rev 179945)
+++ trunk/Tools/Scripts/run-javascriptcore-tests 2015-02-11 20:31:24 UTC (rev 179946)
</span><span class="lines">@@ -48,6 +48,8 @@
</span><span class="cx"> my $extraTests;
</span><span class="cx"> my $jsDriverArgs;
</span><span class="cx"> my $childProcesses;
</span><ins>+my $shellRunner;
+my $makeRunner;
</ins><span class="cx">
</span><span class="cx"> my $buildJSC = 1;
</span><span class="cx">
</span><span class="lines">@@ -82,6 +84,9 @@
</span><span class="cx"> --remote= Run the JSC stress tests on the specified remote host. Implies --tarball.
</span><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><ins>+ --shell-runner Uses the shell-based test runner instead of the default make-based runner.
+ In general the shell runner is slower than the make runner.
+ --make-runner Uses the faster make-based runner.
</ins><span class="cx">
</span><span class="cx"> EOF
</span><span class="cx">
</span><span class="lines">@@ -96,6 +101,8 @@
</span><span class="cx"> 'tarball!' => \$createTarball,
</span><span class="cx"> 'remote=s' => \$remoteHost,
</span><span class="cx"> 'child-processes=s' => \$childProcesses,
</span><ins>+ 'shell-runner' => \$shellRunner,
+ 'make-runner' => \$makeRunner,
</ins><span class="cx"> 'help' => \$showHelp
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -286,6 +293,14 @@
</span><span class="cx"> push(@jscStressDriverCmd, $childProcesses);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ($shellRunner) {
+ push(@jscStressDriverCmd, "--shell-runner");
+ }
+
+ if ($makeRunner) {
+ push(@jscStressDriverCmd, "--make-runner");
+ }
+
</ins><span class="cx"> # End option processing, the rest of the arguments are tests
</span><span class="cx"> push(@jscStressDriverCmd, "--");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (179945 => 179946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2015-02-11 20:29:32 UTC (rev 179945)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2015-02-11 20:31:24 UTC (rev 179946)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> $tarball = false
</span><span class="cx"> $tarFileName = "payload.tar.gz"
</span><span class="cx"> $copyVM = false
</span><del>-$testRunnerType = :make
</del><ins>+$testRunnerType = nil
</ins><span class="cx"> $remoteUser = nil
</span><span class="cx"> $remoteHost = nil
</span><span class="cx"> $remotePort = nil
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> puts " e.g. darwin, linux & windows."
</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><ins>+ puts "--make-runner Uses the faster make-based runner."
</ins><span class="cx"> puts "--remote Specify a remote host on which to run tests."
</span><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="lines">@@ -146,6 +147,7 @@
</span><span class="cx"> ['--arch', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--os', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--shell-runner', GetoptLong::NO_ARGUMENT],
</span><ins>+ ['--make-runner', GetoptLong::NO_ARGUMENT],
</ins><span class="cx"> ['--remote', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--child-processes', '-c', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--verbose', '-v', GetoptLong::NO_ARGUMENT]).each {
</span><span class="lines">@@ -175,9 +177,10 @@
</span><span class="cx"> $copyVM = true
</span><span class="cx"> when '--shell-runner'
</span><span class="cx"> $testRunnerType = :shell
</span><ins>+ when '--make-runner'
+ $testRunnerType = :make
</ins><span class="cx"> when '--remote'
</span><span class="cx"> $copyVM = true
</span><del>- $testRunnerType = :shell
</del><span class="cx"> $tarball = true
</span><span class="cx"> $remote = true
</span><span class="cx"> uri = URI("ssh://" + arg)
</span><span class="lines">@@ -262,6 +265,14 @@
</span><span class="cx"> $architecture = determineArchitecture unless $architecture
</span><span class="cx"> $hostOS = determineOS unless $hostOS
</span><span class="cx">
</span><ins>+if !$testRunnerType
+ if $remote and $hostOS == "darwin"
+ $testRunnerType = :shell
+ else
+ $testRunnerType = :make
+ end
+end
+
</ins><span class="cx"> $numFailures = 0
</span><span class="cx">
</span><span class="cx"> BASE_OPTIONS = ["--useFTLJIT=false", "--enableFunctionDotArguments=true"]
</span><span class="lines">@@ -1245,17 +1256,6 @@
</span><span class="cx"> }
</span><span class="cx"> end
</span><span class="cx">
</span><del>-def runTestRunner
- case $testRunnerType
- when :shell
- runShellTestRunner
- when :make
- runMakeTestRunner
- else
- raise "Unknown test runner type: #{$testRunnerType.to_s}"
- end
-end
-
</del><span class="cx"> def sshRead(cmd)
</span><span class="cx"> raise unless $remote
</span><span class="cx">
</span><span class="lines">@@ -1367,7 +1367,16 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-def runShellTestRunner
</del><ins>+def runTestRunner
+ case $testRunnerType
+ when :shell
+ testRunnerCommand = "sh runscript"
+ when :make
+ testRunnerCommand = "make -j #{$numChildProcesses.to_s} -s -f Makefile"
+ else
+ raise "Unknown test runner type: #{$testRunnerType.to_s}"
+ end
+
</ins><span class="cx"> if $remote
</span><span class="cx"> $remoteDirectory = JSON::parse(sshRead("cat ~/.bencher"))["tempPath"]
</span><span class="cx"> mysys("ssh", "-p", $remotePort.to_s, "#{$remoteUser}@#{$remoteHost}", "mkdir -p #{$remoteDirectory}")
</span><span class="lines">@@ -1379,22 +1388,15 @@
</span><span class="cx"> remoteScript += "cd #{$outputDir.basename}/.runner && "
</span><span class="cx"> remoteScript += "export DYLD_FRAMEWORK_PATH=\\\"\\$(cd #{$testingFrameworkPath.dirname}; pwd)\\\" && "
</span><span class="cx"> remoteScript += "export JSC_timeout=#{Shellwords.shellescape(ENV['JSC_timeout'])} && "
</span><del>- remoteScript += "sh runscript\""
</del><ins>+ remoteScript += "#{testRunnerCommand}\""
</ins><span class="cx"> runAndMonitorTestRunnerCommand("ssh", "-p", $remotePort.to_s, "#{$remoteUser}@#{$remoteHost}", remoteScript)
</span><span class="cx"> else
</span><span class="cx"> Dir.chdir($runnerDir) {
</span><del>- runAndMonitorTestRunnerCommand("sh", "runscript")
</del><ins>+ runAndMonitorTestRunnerCommand(testRunnerCommand)
</ins><span class="cx"> }
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-def runMakeTestRunner
- raise if $remote
- Dir.chdir($runnerDir) {
- runAndMonitorTestRunnerCommand("make", "-j", $numChildProcesses.to_s, "-s", "-f", "Makefile")
- }
-end
-
</del><span class="cx"> def detectFailures
</span><span class="cx"> raise if $bundle
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>