<!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>[175442] 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/175442">175442</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-10-31 17:23:29 -0700 (Fri, 31 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>No way to specify target os or architecture when using the --no-copy option with run-jsc-stress-tests
https://bugs.webkit.org/show_bug.cgi?id=138268
Reviewed by Andreas Kling.
Added a --arch and --os option to set or override the values that are
normally computed based on examining the JavaScriptCore we want to test.
* Scripts/run-jsc-stress-tests:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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 (175441 => 175442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-01 00:12:51 UTC (rev 175441)
+++ trunk/Tools/ChangeLog 2014-11-01 00:23:29 UTC (rev 175442)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-31 Michael Saboff <msaboff@apple.com>
+
+ No way to specify target os or architecture when using the --no-copy option with run-jsc-stress-tests
+ https://bugs.webkit.org/show_bug.cgi?id=138268
+
+ Reviewed by Andreas Kling.
+
+ Added a --arch and --os option to set or override the values that are
+ normally computed based on examining the JavaScriptCore we want to test.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2014-10-31 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> llvmForJSC build emits a linker warning that it can't find usr/local/LLVMForJavaScriptCore/lib under the build directory
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (175441 => 175442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-11-01 00:12:51 UTC (rev 175441)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-11-01 00:23:29 UTC (rev 175442)
</span><span class="lines">@@ -114,7 +114,10 @@
</span><span class="cx"> $remoteHost = nil
</span><span class="cx"> $remotePort = nil
</span><span class="cx"> $remoteDirectory = nil
</span><ins>+$architecture = nil
+$hostOS = nil
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def usage
</span><span class="cx"> puts "run-jsc-stress-tests -j <shell path> <collections path> [<collections path> ...]"
</span><span class="cx"> puts
</span><span class="lines">@@ -128,6 +131,10 @@
</span><span class="cx"> puts "--verbose (-v) Print more things while running."
</span><span class="cx"> puts "--run-bundle Runs a bundle previously created by run-jsc-stress-tests."
</span><span class="cx"> puts "--tarball [fileName] Creates a tarball of the final bundle. Use name if supplied for tar file."
</span><ins>+ puts "--arch Specify architecture instead of determining from JavaScriptCore build."
+ puts " e.g. x86, x86_64, arm."
+ puts "--os Specify os instead of determining from JavaScriptCore build."
+ puts " e.g. darwin, linux & windows."
</ins><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 "--remote Specify a remote host on which to run tests."
</span><span class="lines">@@ -147,6 +154,8 @@
</span><span class="cx"> ['--run-bundle', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--tarball', GetoptLong::OPTIONAL_ARGUMENT],
</span><span class="cx"> ['--force-vm-copy', GetoptLong::NO_ARGUMENT],
</span><ins>+ ['--arch', GetoptLong::REQUIRED_ARGUMENT],
+ ['--os', GetoptLong::REQUIRED_ARGUMENT],
</ins><span class="cx"> ['--shell-runner', GetoptLong::NO_ARGUMENT],
</span><span class="cx"> ['--remote', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--child-processes', '-c', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="lines">@@ -186,6 +195,10 @@
</span><span class="cx"> $remoteUser, $remoteHost, $remotePort = uri.user, uri.host, uri.port
</span><span class="cx"> when '--child-processes'
</span><span class="cx"> $numProcessors = arg.to_i
</span><ins>+ when '--arch'
+ $architecture = arg
+ when '--os'
+ $hostOS = arg
</ins><span class="cx"> end
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -257,8 +270,8 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-$architecture = determineArchitecture
-$hostOS = determineOS
</del><ins>+$architecture = determineArchitecture unless $architecture
+$hostOS = determineOS unless $hostOS
</ins><span class="cx">
</span><span class="cx"> $numFailures = 0
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>