Modified: trunk/Tools/ChangeLog (171237 => 171238)
--- trunk/Tools/ChangeLog 2014-07-18 19:29:30 UTC (rev 171237)
+++ trunk/Tools/ChangeLog 2014-07-18 19:41:04 UTC (rev 171238)
@@ -1,5 +1,14 @@
2014-07-18 Filip Pizlo <[email protected]>
+ run-jsc-stress-tests should be able to run helper-based tests in remote mode
+ https://bugs.webkit.org/show_bug.cgi?id=135064
+
+ Reviewed by Mark Hahnenberg.
+
+ * Scripts/run-jsc-stress-tests:
+
+2014-07-18 Filip Pizlo <[email protected]>
+
run-jsc-stress-tests: rename $copy to $doNotMessWithVMPath
https://bugs.webkit.org/show_bug.cgi?id=135061
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (171237 => 171238)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-07-18 19:29:30 UTC (rev 171237)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-07-18 19:41:04 UTC (rev 171238)
@@ -279,15 +279,23 @@
end
end
-def pathToVM
+def pathToBundleResourceFromBenchmarkDirectory(resourcePath)
dir = Pathname.new(".")
$benchmarkDirectory.each_filename {
| pathComponent |
dir += ".."
}
- dir + $jscPath
+ dir + resourcePath
end
+def pathToVM
+ pathToBundleResourceFromBenchmarkDirectory($jscPath)
+end
+
+def pathToHelpers
+ pathToBundleResourceFromBenchmarkDirectory(".helpers")
+end
+
def prefixCommand(prefix)
"awk " + Shellwords.shellescape("{ printf #{(prefix + ': ').inspect}; print }")
end
@@ -688,7 +696,7 @@
def runProfiler
profilerOutput = uniqueFilename(".json")
if $canRunDisplayProfilerOutput
- addRunCommand("profiler", ["ruby", (HELPERS_PATH + "profiler-test-helper").to_s, (SCRIPTS_PATH + "display-profiler-output").to_s, profilerOutput.to_s, pathToVM.to_s, "-p", profilerOutput.to_s, $benchmark.to_s], silentOutputHandler, simpleErrorHandler)
+ addRunCommand("profiler", ["ruby", (pathToHelpers + "profiler-test-helper").to_s, (SCRIPTS_PATH + "display-profiler-output").to_s, profilerOutput.to_s, pathToVM.to_s, "-p", profilerOutput.to_s, $benchmark.to_s], silentOutputHandler, simpleErrorHandler)
else
puts "Running simple version of #{$collectionName}/#{$benchmark} because some required Ruby features are unavailable."
run("profiler-simple", "-p", profilerOutput.to_s)
@@ -697,7 +705,7 @@
def runExceptionFuzz
subCommand = escapeAll([pathToVM.to_s, $benchmark.to_s])
- addRunCommand("exception-fuzz", ["perl", (HELPERS_PATH + "js-exception-fuzz").to_s, subCommand], silentOutputHandler, simpleErrorHandler)
+ addRunCommand("exception-fuzz", ["perl", (pathToHelpers + "js-exception-fuzz").to_s, subCommand], silentOutputHandler, simpleErrorHandler)
end
def runLayoutTest(kind, *options)
@@ -1067,6 +1075,10 @@
end
}
end
+
+ Dir.chdir($outputDir) {
+ FileUtils.cp_r HELPERS_PATH, ".helpers"
+ }
ARGV.each {
| collection |
