Title: [155314] trunk/Tools
- Revision
- 155314
- Author
- [email protected]
- Date
- 2013-09-08 13:58:56 -0700 (Sun, 08 Sep 2013)
Log Message
run-jsc-stress-tests should be more paranoid about calling make
https://bugs.webkit.org/show_bug.cgi?id=121011
Reviewed by Oliver Hunt.
If it returns with any kind of error then bail out. Also print the command being used
in case we have to debug this, for example on the bots. The extra verbosity isn't a
big deal.
* Scripts/run-jsc-stress-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (155313 => 155314)
--- trunk/Tools/ChangeLog 2013-09-08 20:58:43 UTC (rev 155313)
+++ trunk/Tools/ChangeLog 2013-09-08 20:58:56 UTC (rev 155314)
@@ -1,5 +1,18 @@
2013-09-08 Filip Pizlo <[email protected]>
+ run-jsc-stress-tests should be more paranoid about calling make
+ https://bugs.webkit.org/show_bug.cgi?id=121011
+
+ Reviewed by Oliver Hunt.
+
+ If it returns with any kind of error then bail out. Also print the command being used
+ in case we have to debug this, for example on the bots. The extra verbosity isn't a
+ big deal.
+
+ * Scripts/run-jsc-stress-tests:
+
+2013-09-08 Filip Pizlo <[email protected]>
+
Unreviewed, never pass Pathname to shellescape() as old versions of Ruby don't
like that. Pass a string instead.
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (155313 => 155314)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2013-09-08 20:58:43 UTC (rev 155313)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2013-09-08 20:58:56 UTC (rev 155314)
@@ -36,6 +36,16 @@
$stderr.puts "Error: #{e.inspect}"
end
+def mysys(*cmd)
+ begin
+ commandArray = cmd.each{|value| Shellwords.shellescape(value.to_s)}.join(' ')
+ rescue
+ commandArray = cmd.join(' ')
+ end
+ $stderr.puts ">> #{commandArray}"
+ raise "Command failed: #{$?.inspect}" unless system(*cmd)
+end
+
numProcessors = `sysctl -n hw.availcpu`.to_i
$jscPath = nil
@@ -319,7 +329,7 @@
}
Dir.chdir(parallelDir) {
- system("make", "-j", numProcessors.to_s, "-s", "-f", "Makefile")
+ mysys("make", "-j", numProcessors.to_s, "-s", "-f", "Makefile")
}
Dir.foreach(parallelDir) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
