Changeset 81225 in webkit

Timestamp:

Mar 16, 2011 12:51:12 AM (13 years ago)

Author:

hayato@chromium.org

Message:

2011-03-15 Hayato Ito <​hayato@chromium.org>

Reviewed by Ojan Vafai.

Ignore files that will be used by reftests in old-run-webkit-tests.

​https://bugs.webkit.org/show_bug.cgi?id=55936

• Scripts/old-run-webkit-tests:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-15  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Ignore files that will be used by reftests in old-run-webkit-tests.
+
+        https://bugs.webkit.org/show_bug.cgi?id=55936
+
+        * Scripts/old-run-webkit-tests:
+
 2011-03-15  Felipe Oliveira da Silva Netto  <f.dachshund@gmail.com>
 

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

@@ -188 +188 @@
 
 my $expectedTag = "expected";
+my $mismatchTag = "mismatch";
 my $actualTag = "actual";
 my $prettyDiffTag = "pretty-diff";
@@ -2447 +2448 @@
 my @testsFound;
 
+sub isUsedInReftest
+{
+    my $filename = $_;
+    if ($filename =~ /-$expectedTag(-$mismatchTag)?\.html$/) {
+        return 1;
+    }
+    my $base = stripExtension($filename);
+    return (-f "$base-$expectedTag.html" || -f "$base-$expectedTag-$mismatchTag.html");
+}
+
 sub directoryFilter
 {
@@ -2458 +2469 @@
     my $filename = $_;
     if ($filename =~ /\.([^.]+)$/) {
-        if (exists $supportedFileExtensions{$1}) {
+        my $extension = $1;
+        if (exists $supportedFileExtensions{$extension} && !isUsedInReftest($filename)) {
             my $path = File::Spec->abs2rel(catfile($File::Find::dir, $filename), $testDirectory);
             push @testsFound, $path if !exists $ignoredFiles{$path};