Title: [158301] trunk/Tools
- Revision
- 158301
- Author
- fpi...@apple.com
- Date
- 2013-10-30 12:10:20 -0700 (Wed, 30 Oct 2013)
Log Message
run-jsc-stress-tests should handle ".." in paths and "slow!" in cmd's
https://bugs.webkit.org/show_bug.cgi?id=123521
Reviewed by Mark Hahnenberg.
* Scripts/run-jsc-stress-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (158300 => 158301)
--- trunk/Tools/ChangeLog 2013-10-30 19:07:45 UTC (rev 158300)
+++ trunk/Tools/ChangeLog 2013-10-30 19:10:20 UTC (rev 158301)
@@ -1,3 +1,12 @@
+2013-10-30 Filip Pizlo <fpi...@apple.com>
+
+ run-jsc-stress-tests should handle ".." in paths and "slow!" in cmd's
+ https://bugs.webkit.org/show_bug.cgi?id=123521
+
+ Reviewed by Mark Hahnenberg.
+
+ * Scripts/run-jsc-stress-tests:
+
2013-10-30 Alexey Proskuryakov <a...@apple.com>
Mavericks: 128 tests are failing due to pixel differences
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (158300 => 158301)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2013-10-30 19:07:45 UTC (rev 158300)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2013-10-30 19:10:20 UTC (rev 158301)
@@ -362,7 +362,6 @@
# returns false, in which case you're supposed to add your own run commands.
def parseRunCommands
didRun = false
- $runCommandOptions = {}
File.open($benchmarkDirectory + $benchmark) {
| inp |
inp.each_line {
@@ -445,6 +444,16 @@
end
end
+def defaultQuickRun
+ if $enableFTL
+ runDefaultFTL
+ runFTLNoCJIT
+ else
+ runDefault
+ runNoCJIT
+ end
+end
+
def runProfiler
profilerOutput = uniqueFilename(".json")
if $canRunDisplayProfilerOutput
@@ -614,6 +623,10 @@
next
end
+ if Pathname.new(entry["path"]).absolute?
+ raise "Absolute path: " + entry["path"] + " in #{collection}"
+ end
+
if paths[entry["path"]]
raise "Duplicate path: " + entry["path"] + " in #{collection}"
end
@@ -627,7 +640,13 @@
end
$collection = subCollection
- $collectionName = (Pathname.new(collectionName) + subCollectionName).to_s
+ $collectionName = Pathname.new(collectionName)
+ Pathname.new(subCollectionName).each_filename {
+ | filename |
+ next if filename =~ /^\./
+ $collectionName += filename
+ }
+ $collectionName = $collectionName.to_s
prepareCollection($collectionName)
@@ -639,6 +658,7 @@
$benchmark = path.basename
$benchmarkDirectory = path.dirname
+ $runCommandOptions = {}
eval entry["cmd"]
}
}
@@ -662,6 +682,7 @@
$benchmark = path.basename
+ $runCommandOptions = {}
defaultRun unless parseRunCommands
}
end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
