Modified: trunk/Tools/ChangeLog (159963 => 159964)
--- trunk/Tools/ChangeLog 2013-12-02 22:31:59 UTC (rev 159963)
+++ trunk/Tools/ChangeLog 2013-12-02 22:33:31 UTC (rev 159964)
@@ -1,3 +1,15 @@
+2013-12-02 Mark Hahnenberg <[email protected]>
+
+ run-jsc-stress-tests always copies the VM
+ https://bugs.webkit.org/show_bug.cgi?id=125092
+
+ Reviewed by Filip Pizlo.
+
+ This can be slow, especially with full debug builds. It should just symlink the VM into the
+ bundle by default and do a full copy only when asked.
+
+ * Scripts/run-jsc-stress-tests:
+
2013-12-02 Brent Fulgham <[email protected]>
[Win] Port run-jsc-stress-tests
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (159963 => 159964)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2013-12-02 22:31:59 UTC (rev 159963)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2013-12-02 22:33:31 UTC (rev 159964)
@@ -91,6 +91,7 @@
$verbosity = 0
$bundle = nil
$tarball = false
+$copyVM = false
def usage
puts "run-jsc-stress-tests -j <shell path> <collections path> [<collections path> ...]"
@@ -111,6 +112,7 @@
['--output-dir', '-o', GetoptLong::REQUIRED_ARGUMENT],
['--run-bundle', GetoptLong::REQUIRED_ARGUMENT],
['--tarball', GetoptLong::NO_ARGUMENT],
+ ['--force-vm-copy', GetoptLong::NO_ARGUMENT],
['--verbose', '-v', GetoptLong::NO_ARGUMENT]).each {
| opt, arg |
case opt
@@ -128,6 +130,9 @@
$bundle = Pathname.new(arg)
when '--tarball'
$tarball = true
+ $copyVM = true
+ when '--force-vm-copy'
+ $copyVM = true
end
}
@@ -171,13 +176,28 @@
$jscPath = $frameworkPath + "Resources" + "jsc"
if frameworkPath
- FileUtils.cp_r frameworkPath, $outputDir + ".vm"
+ source = frameworkPath
+ destination = Pathname.new(".vm")
else
+ source = jscPath
+ destination = $jscPath
+
Dir.chdir($outputDir) {
FileUtils.mkdir_p $jscPath.dirname
- FileUtils.cp jscPath, $jscPath
}
end
+
+ Dir.chdir($outputDir) {
+ if $copyVM
+ FileUtils.cp_r source, destination
+ else
+ begin
+ FileUtils.ln_s source, destination
+ rescue
+ FileUtils.cp_r source, destination
+ end
+ end
+ }
end
def copyVMToBundle
