Title: [171413] branches/safari-600.1-branch/Tools
- Revision
- 171413
- Author
- dburk...@apple.com
- Date
- 2014-07-22 22:48:55 -0700 (Tue, 22 Jul 2014)
Log Message
Merge r171216
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Tools/ChangeLog (171412 => 171413)
--- branches/safari-600.1-branch/Tools/ChangeLog 2014-07-23 05:46:59 UTC (rev 171412)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-07-23 05:48:55 UTC (rev 171413)
@@ -1,5 +1,16 @@
2014-07-22 Dana Burkart <dburk...@apple.com>
+ Merge r171216.
+
+ 2014-07-18 Filip Pizlo <fpi...@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.
+
+2014-07-22 Dana Burkart <dburk...@apple.com>
+
Merge r171213.
2014-07-15 Filip Pizlo <fpi...@apple.com>
Modified: branches/safari-600.1-branch/Tools/Scripts/jsc-stress-test-helpers/js-exception-fuzz (171412 => 171413)
--- branches/safari-600.1-branch/Tools/Scripts/jsc-stress-test-helpers/js-exception-fuzz 2014-07-23 05:46:59 UTC (rev 171412)
+++ branches/safari-600.1-branch/Tools/Scripts/jsc-stress-test-helpers/js-exception-fuzz 2014-07-23 05:48:55 UTC (rev 171413)
@@ -57,7 +57,7 @@
'verbose' => \$verbose
);
-my $commandString = shell_quote @ARGV;
+my $commandString = shift @ARGV;
my $checkCount;
Modified: branches/safari-600.1-branch/Tools/Scripts/run-jsc-stress-tests (171412 => 171413)
--- branches/safari-600.1-branch/Tools/Scripts/run-jsc-stress-tests 2014-07-23 05:46:59 UTC (rev 171412)
+++ branches/safari-600.1-branch/Tools/Scripts/run-jsc-stress-tests 2014-07-23 05:48:55 UTC (rev 171413)
@@ -74,6 +74,14 @@
raise "Command failed: #{$?.inspect}" unless system(*cmd)
end
+def escapeAll(array)
+ array.map {
+ | v |
+ raise "Detected a non-string in #{inspect}" unless v.is_a? String
+ Shellwords.shellescape(v)
+ }.join(' ')
+end
+
begin
$numProcessors = `sysctl -n hw.activecpu 2>/dev/null`.to_i
rescue
@@ -481,11 +489,7 @@
# It's important to remember that the test is actually run in a subshell, so if we change directory
# in the subshell when we return we will be in our original directory. This is nice because we don't
# have to bend over backwards to do things relative to the root.
- "(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(' ') + ")"
+ "(cd ../#{Shellwords.shellescape(@directory.to_s)} && \"$@\" " + escapeAll(@arguments) + ")"
end
def reproScriptCommand
@@ -734,7 +738,8 @@
end
def runExceptionFuzz
- addRunCommand("exception-fuzz", ["perl", (HELPERS_PATH + "js-exception-fuzz").to_s, pathToVM.to_s, $benchmark.to_s], silentOutputHandler, simpleErrorHandler)
+ subCommand = escapeAll([pathToVM.to_s, $benchmark.to_s])
+ addRunCommand("exception-fuzz", ["perl", (HELPERS_PATH + "js-exception-fuzz").to_s, subCommand], silentOutputHandler, simpleErrorHandler)
end
def runLayoutTest(kind, *options)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
