Changeset 87162 in webkit

Timestamp:

May 24, 2011 10:07:31 AM (13 years ago)

Author:

Csaba Osztrogonác

Message:

2011-05-24 Csaba Osztrogonác <Csaba Osztrogonác>

Reviewed by Kenneth Rohde Christiansen.

[ORWT]Make --skipped=only option work with parameters with LayoutTests/ prefix
​https://bugs.webkit.org/show_bug.cgi?id=61052

• Scripts/old-run-webkit-tests:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/old-run-webkit-tests (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-24  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [ORWT]Make --skipped=only option work with parameters with LayoutTests/ prefix
+        https://bugs.webkit.org/show_bug.cgi?id=61052
+
+        * Scripts/old-run-webkit-tests:
+
 2011-05-24  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/old-run-webkit-tests

@@ -2420 +2420 @@
                                 # Always add $skipped since no constraint path was specified on the command line.
                                 push(@ARGV, $skipped);
-                            } elsif ($skipped =~ /^($constraintPath)/) {
+                            } elsif ($skipped =~ /^($constraintPath)/ || ("LayoutTests/".$skipped) =~ /^($constraintPath)/ ) {
                                 # Add $skipped only if it matches the current path constraint, e.g.,
-                                # "--skipped=only dir1" with "dir1/file1.html" on the skipped list.
+                                # "--skipped=only dir1" with "dir1/file1.html" on the skipped list or
+                                # "--skipped=only LayoutTests/dir1" with "dir1/file1.html" on the skipped list
                                 push(@ARGV, $skipped);
-                            } elsif ($constraintPath =~ /^($skipped)/) {
+                            } elsif ($constraintPath =~ /^("LayoutTests\/".$skipped)/ || $constraintPath =~ /^($skipped)/) {
                                 # Add current path constraint if it is more specific than the skip list entry,
-                                # e.g., "--skipped=only dir1/dir2/dir3" with "dir1" on the skipped list.
+                                # e.g., "--skipped=only dir1/dir2/dir3" with "dir1" on the skipped list or
+                                # e.g., "--skipped=only LayoutTests/dir1/dir2/dir3" with "dir1" on the skipped list.
                                 push(@ARGV, $constraintPath);
                             }