<!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>[169217] 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/169217">169217</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 14:11:55 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add option to run-jsc-stress-tests to use installed jsc
https://bugs.webkit.org/show_bug.cgi?id=133102
Reviewed by Geoffrey Garen.
Added --no-copy option to not copy a JavaScriptCore framework, but use the one
provied with the --jsc option.
* 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 (169216 => 169217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-22 21:10:46 UTC (rev 169216)
+++ trunk/Tools/ChangeLog 2014-05-22 21:11:55 UTC (rev 169217)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-22 Michael Saboff <msaboff@apple.com>
+
+ Add option to run-jsc-stress-tests to use installed jsc
+ https://bugs.webkit.org/show_bug.cgi?id=133102
+
+ Reviewed by Geoffrey Garen.
+
+ Added --no-copy option to not copy a JavaScriptCore framework, but use the one
+ provied with the --jsc option.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2014-05-21 Zsolt Borbely <zsborbely.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Add include path of compact_unwind_encoding.h if FTL JIT is enabled
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (169216 => 169217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-05-22 21:10:46 UTC (rev 169216)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-05-22 21:11:55 UTC (rev 169217)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> $jscPath = nil
</span><ins>+$copy = true
</ins><span class="cx"> $enableFTL = false
</span><span class="cx"> $outputDir = Pathname.new("results")
</span><span class="cx"> $verbosity = 0
</span><span class="lines">@@ -106,7 +107,9 @@
</span><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><del>- puts "--jsc (-j) Path to JavaScriptCore. This option is required."
</del><ins>+ puts "--jsc (-j) Path to JavaScriptCore build product. This option is required."
+ puts "--no-copy Do not copy the JavaScriptCore build product before testing."
+ puts " --jsc specifies an already present JavaScriptCore to test."
</ins><span class="cx"> puts "--ftl-jit Indicate that we have the FTL JIT."
</span><span class="cx"> puts "--output-dir (-o) Path where to put results. Default is #{$outputDir}."
</span><span class="cx"> puts "--verbose (-v) Print more things while running."
</span><span class="lines">@@ -120,8 +123,11 @@
</span><span class="cx"> exit 1
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+jscArg = ""
+
</ins><span class="cx"> GetoptLong.new(['--help', '-h', GetoptLong::NO_ARGUMENT],
</span><span class="cx"> ['--jsc', '-j', GetoptLong::REQUIRED_ARGUMENT],
</span><ins>+ ['--no-copy', GetoptLong::NO_ARGUMENT],
</ins><span class="cx"> ['--ftl-jit', GetoptLong::NO_ARGUMENT],
</span><span class="cx"> ['--output-dir', '-o', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--run-bundle', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="lines">@@ -136,7 +142,9 @@
</span><span class="cx"> when '--help'
</span><span class="cx"> usage
</span><span class="cx"> when '--jsc'
</span><del>- $jscPath = Pathname.new(arg).realpath
</del><ins>+ jscArg = arg
+ when '--no-copy'
+ $copy = false
</ins><span class="cx"> when '--output-dir'
</span><span class="cx"> $outputDir = Pathname.new(arg)
</span><span class="cx"> when '--ftl-jit'
</span><span class="lines">@@ -164,6 +172,14 @@
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if jscArg
+ if $copy
+ $jscPath = Pathname.new(jscArg).realpath
+ else
+ $jscPath = Pathname.new(jscArg)
+ end
+end
+
</ins><span class="cx"> $progressMeter = ($verbosity == 0 and $stdin.tty?)
</span><span class="cx">
</span><span class="cx"> if $bundle
</span><span class="lines">@@ -172,7 +188,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> unless $jscPath
</span><del>- $stderr.puts "Error: must specify -j <path>."
</del><ins>+ $stderr.puts "Error: must specify -jsc <path>"
</ins><span class="cx"> exit 1
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -237,8 +253,9 @@
</span><span class="cx">
</span><span class="cx"> def prepareFramework(jscPath)
</span><span class="cx"> frameworkPath = frameworkFromJSCPath(jscPath)
</span><del>- $frameworkPath = Pathname.new(".vm") + "JavaScriptCore.framework"
- $jscPath = $frameworkPath + "Resources" + "jsc"
</del><ins>+ destinationFrameworkPath = Pathname.new(".vm") + "JavaScriptCore.framework"
+ $jscPath = destinationFrameworkPath + "Resources" + "jsc"
+ $testingFrameworkPath = Pathname.new("..") + destinationFrameworkPath
</ins><span class="cx">
</span><span class="cx"> if frameworkPath
</span><span class="cx"> source = frameworkPath
</span><span class="lines">@@ -460,7 +477,7 @@
</span><span class="cx"> }
</span><span class="cx"> script += "cd .runner\n"
</span><span class="cx">
</span><del>- script += "export DYLD_FRAMEWORK_PATH=$(cd ../#{$frameworkPath.dirname}; pwd)\n"
</del><ins>+ script += "export DYLD_FRAMEWORK_PATH=$(cd #{$testingFrameworkPath.dirname}; pwd)\n"
</ins><span class="cx"> IMPORTANT_ENVS.each {
</span><span class="cx"> | key |
</span><span class="cx"> if ENV[key]
</span><span class="lines">@@ -1014,7 +1031,16 @@
</span><span class="cx"> def prepareBundle
</span><span class="cx"> raise if $bundle
</span><span class="cx">
</span><del>- copyVMToBundle
</del><ins>+ if $copy
+ copyVMToBundle
+ else
+ if !$remote
+ $testingFrameworkPath = frameworkFromJSCPath($jscPath).realpath
+ $jscPath = Pathname.new($jscPath).realpath
+ else
+ $testingFrameworkPath = frameworkFromJSCPath($jscPath)
+ end
+ end
</ins><span class="cx">
</span><span class="cx"> ARGV.each {
</span><span class="cx"> | collection |
</span><span class="lines">@@ -1211,7 +1237,7 @@
</span><span class="cx"> remoteScript += "rm -rf #{$outputDir.basename} && "
</span><span class="cx"> remoteScript += "tar xzf payload.tar.gz && "
</span><span class="cx"> remoteScript += "cd #{$outputDir.basename}/.runner && "
</span><del>- remoteScript += "DYLD_FRAMEWORK_PATH=$(cd ../#{$frameworkPath.dirname}; pwd) sh runscript"
</del><ins>+ remoteScript += "DYLD_FRAMEWORK_PATH=$(cd #{$testingFrameworkPath.dirname}; pwd) sh runscript"
</ins><span class="cx"> system("ssh", "-p", $remotePort.to_s, "#{$remoteUser}@#{$remoteHost}", remoteScript)
</span><span class="cx"> else
</span><span class="cx"> Dir.chdir($runnerDir) {
</span></span></pre>
</div>
</div>
</body>
</html>