<!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>[171216] 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/171216">171216</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-18 00:11:11 -0700 (Fri, 18 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, fix build for platforms that don't have ShellQuote.
* Scripts/jsc-stress-test-helpers/js-exception-fuzz: Take a single argument that has the whole command string.
* Scripts/run-jsc-stress-tests: Do the escaping in Ruby.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsjscstresstesthelpersjsexceptionfuzz">trunk/Tools/Scripts/jsc-stress-test-helpers/js-exception-fuzz</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 (171215 => 171216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-18 06:16:56 UTC (rev 171215)
+++ trunk/Tools/ChangeLog 2014-07-18 07:11:11 UTC (rev 171216)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-07-18 Filip Pizlo <fpizlo@apple.com>
+
+ Unreviewed, fix build for platforms that don't have ShellQuote.
+
+ * Scripts/jsc-stress-test-helpers/js-exception-fuzz: Take a single argument that has the whole command string.
+ * Scripts/run-jsc-stress-tests: Do the escaping in Ruby.
+
</ins><span class="cx"> 2014-07-15 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Need ability to fuzz exception throwing
</span></span></pre></div>
<a id="trunkToolsScriptsjscstresstesthelpersjsexceptionfuzz"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/jsc-stress-test-helpers/js-exception-fuzz (171215 => 171216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/jsc-stress-test-helpers/js-exception-fuzz 2014-07-18 06:16:56 UTC (rev 171215)
+++ trunk/Tools/Scripts/jsc-stress-test-helpers/js-exception-fuzz 2014-07-18 07:11:11 UTC (rev 171216)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> 'verbose' => \$verbose
</span><span class="cx"> );
</span><span class="cx">
</span><del>-my $commandString = shell_quote @ARGV;
</del><ins>+my $commandString = shift @ARGV;
</ins><span class="cx">
</span><span class="cx"> my $checkCount;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (171215 => 171216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-07-18 06:16:56 UTC (rev 171215)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-07-18 07:11:11 UTC (rev 171216)
</span><span class="lines">@@ -74,6 +74,14 @@
</span><span class="cx"> raise "Command failed: #{$?.inspect}" unless system(*cmd)
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+def escapeAll(array)
+ array.map {
+ | v |
+ raise "Detected a non-string in #{inspect}" unless v.is_a? String
+ Shellwords.shellescape(v)
+ }.join(' ')
+end
+
</ins><span class="cx"> begin
</span><span class="cx"> $numProcessors = `sysctl -n hw.activecpu 2>/dev/null`.to_i
</span><span class="cx"> rescue
</span><span class="lines">@@ -481,11 +489,7 @@
</span><span class="cx"> # It's important to remember that the test is actually run in a subshell, so if we change directory
</span><span class="cx"> # in the subshell when we return we will be in our original directory. This is nice because we don't
</span><span class="cx"> # have to bend over backwards to do things relative to the root.
</span><del>- "(cd ../#{Shellwords.shellescape(@directory.to_s)} && \"$@\" " + @arguments.map{
- | v |
- raise "Detected a non-string in #{inspect}" unless v.is_a? String
- Shellwords.shellescape(v)
- }.join(' ') + ")"
</del><ins>+ "(cd ../#{Shellwords.shellescape(@directory.to_s)} && \"$@\" " + escapeAll(@arguments) + ")"
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def reproScriptCommand
</span><span class="lines">@@ -734,7 +738,8 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runExceptionFuzz
</span><del>- addRunCommand("exception-fuzz", ["perl", (HELPERS_PATH + "js-exception-fuzz").to_s, pathToVM.to_s, $benchmark.to_s], silentOutputHandler, simpleErrorHandler)
</del><ins>+ subCommand = escapeAll([pathToVM.to_s, $benchmark.to_s])
+ addRunCommand("exception-fuzz", ["perl", (HELPERS_PATH + "js-exception-fuzz").to_s, subCommand], silentOutputHandler, simpleErrorHandler)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runLayoutTest(kind, *options)
</span></span></pre>
</div>
</div>
</body>
</html>