Title: [171237] trunk/Tools
- Revision
- 171237
- Author
- [email protected]
- Date
- 2014-07-18 12:29:30 -0700 (Fri, 18 Jul 2014)
Log Message
run-jsc-stress-tests: rename $copy to $doNotMessWithVMPath
https://bugs.webkit.org/show_bug.cgi?id=135061
Rubber stamped by Mark Hahnenberg.
* Scripts/run-jsc-stress-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (171236 => 171237)
--- trunk/Tools/ChangeLog 2014-07-18 19:17:25 UTC (rev 171236)
+++ trunk/Tools/ChangeLog 2014-07-18 19:29:30 UTC (rev 171237)
@@ -1,5 +1,14 @@
2014-07-18 Filip Pizlo <[email protected]>
+ run-jsc-stress-tests: rename $copy to $doNotMessWithVMPath
+ https://bugs.webkit.org/show_bug.cgi?id=135061
+
+ Rubber stamped by Mark Hahnenberg.
+
+ * Scripts/run-jsc-stress-tests:
+
+2014-07-18 Filip Pizlo <[email protected]>
+
Refactor run-jsc-stress-tests VM copying code to remove some abstractions
https://bugs.webkit.org/show_bug.cgi?id=135059
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (171236 => 171237)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-07-18 19:17:25 UTC (rev 171236)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-07-18 19:29:30 UTC (rev 171237)
@@ -100,7 +100,7 @@
end
$jscPath = nil
-$copy = true
+$doNotMessWithVMPath = false
$enableFTL = false
$memoryLimited = false
$outputDir = Pathname.new("results")
@@ -157,7 +157,7 @@
when '--jsc'
jscArg = arg
when '--no-copy'
- $copy = false
+ $doNotMessWithVMPath = true
when '--output-dir'
$outputDir = Pathname.new(arg)
when '--ftl-jit'
@@ -192,10 +192,10 @@
exit 1
end
-if $copy
+if $doNotMessWithVMPath
+ $jscPath = Pathname.new(jscArg)
+else
$jscPath = Pathname.new(jscArg).realpath
-else
- $jscPath = Pathname.new(jscArg)
end
$progressMeter = ($verbosity == 0 and $stdout.tty?)
@@ -1027,7 +1027,14 @@
def prepareBundle
raise if $bundle
- if $copy
+ if $doNotMessWithVMPath
+ if !$remote and !$tarball
+ $testingFrameworkPath = frameworkFromJSCPath($jscPath).realpath
+ $jscPath = Pathname.new($jscPath).realpath
+ else
+ $testingFrameworkPath = frameworkFromJSCPath($jscPath)
+ end
+ else
vmDir = $outputDir + ".vm"
FileUtils.mkdir_p vmDir
@@ -1059,13 +1066,6 @@
end
end
}
- else
- if !$remote and !$tarball
- $testingFrameworkPath = frameworkFromJSCPath($jscPath).realpath
- $jscPath = Pathname.new($jscPath).realpath
- else
- $testingFrameworkPath = frameworkFromJSCPath($jscPath)
- end
end
ARGV.each {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
