Attachment 210958 Details for Bug 120994 – the patch

[patch] the patch

blah.patch (text/plain), 2.65 KB, created by Filip Pizlo on 2013-09-07 21:04:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Filip Pizlo

Created: 2013-09-07 21:04:03 PDT

Size: 2.65 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 155280)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2013-09-07  Filip Pizlo  <fpizlo@apple.com>
>+
>+        run-jsc-stress-tests should be smart enough to call JSRegress "regress/script-tests" rather than "script-tests"
>+        https://bugs.webkit.org/show_bug.cgi?id=120994
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        run-jsc-stress-tests accepts a list of directories containing tests.  It needs to
>+        come up with names for all of them.  Currently it uses the basename of the test
>+        directory.  But that means that JSRegress gets called "script-tests", which is
>+        unfortunate since any directory in LayoutTests containing .js files will be
>+        called "script-tests".  So, this changes run-jsc-stress-tests to use more than
>+        just the basename if the basename has the word "tests" in it.  This causes
>+        JSRegress to be called "regress/script-tests".
>+
>+        * Scripts/run-jsc-stress-tests:
>+
> 2013-09-07  Filip Pizlo  <fpizlo@apple.com>
> 
>         Only run FTL tests if we have the FTL
>Index: Tools/Scripts/run-jsc-stress-tests
>===================================================================
>--- Tools/Scripts/run-jsc-stress-tests	(revision 155278)
>+++ Tools/Scripts/run-jsc-stress-tests	(working copy)
>@@ -137,7 +137,7 @@ def defaultRun
> end
> 
> def skip
>-    puts "Skipping #{$benchmark}"
>+    puts "Skipping #{$collectionName}/#{$benchmark}"
> end
> 
> collectionNames = {}
>@@ -152,17 +152,29 @@ $outputDir = $outputDir.realpath
> 
> ARGV.each {
>     | collection |
>-    $collection = collection
>-    $collectionName = File.basename(collection)
>+    $collection = Pathname.new(collection)
>+    outerDir = $collection.dirname
>+    name = $collection.basename
>+    lastName = name
>+    while lastName.to_s =~ /test/
>+        lastName = outerDir.basename
>+        name = lastName + name
>+        outerDir = outerDir.dirname
>+    end
>+    $collectionName = name.to_s
>     toAdd = 1
>     while collectionNames[$collectionName]
>-        $collectionName = File.basename(collection) + "-#{toAdd}"
>+        $collectionName = File.basename(name.to_s) + "-#{toAdd}"
>         toAdd += 1
>     end
>     collectionNames[$collectionName] = true
>-    dir = $outputDir + $collectionName
>-    Dir.mkdir(dir) unless dir.directory?
>-    Dir.chdir(collection) {
>+    dir = $outputDir
>+    name.each_filename {
>+        | filename |
>+        dir = dir + filename
>+        Dir.mkdir(dir) unless dir.directory?
>+    }
>+    Dir.chdir($collection) {
>         Dir.foreach('.') {
>             | benchmark |
>             next unless benchmark =~ /\.js$/

Flags:

ggaren: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 120994: 210958