Changeset 29235 in webkit

Timestamp:

Jan 7, 2008 11:58:24 AM (16 years ago)

Author:

Nikolas Zimmermann

Message:

Fixes: ​http://bugs.webkit.org/show_bug.cgi?id=16244
DRT doesn't handle platform specific pixel test results correctly.

<test>-expected.txt files and <test>-expected.png files may now live
in different directories (ie. a cross-platform <test>-expected.txt file
and a platform-specific <test>-expected.png file).

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2008-01-07  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Adam.
+
+        Fixes: http://bugs.webkit.org/show_bug.cgi?id=16244
+        DRT doesn't handle platform specific pixel test results correctly.
+
+        <test>-expected.txt files and <test>-expected.png files may now live
+        in different directories (ie. a cross-platform <test>-expected.txt file
+        and a platform-specific <test>-expected.png file).
+
+        * Scripts/run-webkit-tests:
+
 2008-01-04  Kevin McCullough  <kmccullough@apple.com>
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -79 +79 @@
 sub stripExtension($);
 sub isTextOnlyTest($);
-sub expectedDirectoryForTest($;$);
+sub expectedDirectoryForTest($;$;$);
 sub printFailureMessageForTest($$);
 sub toURL($);
@@ -516 +516 @@
 
     my $expected;
-    my $expectedDir = expectedDirectoryForTest($base, $isText);
+    my $expectedDir = expectedDirectoryForTest($base, $isText, 0);
     $expectedResultDirectory{$base} = $expectedDir;
 
@@ -548 +548 @@
     
     if ($pixelTests) {
+        my $expectedPixelDir = expectedDirectoryForTest($base, $isText, 1);
+
         my $actualHash = "";
         my $expectedHash = "";
@@ -564 +566 @@
         }
 
-        if ($expectedHash ne $actualHash && -f "$expectedDir/$base-$expectedTag.png") {
-            my $expectedPNGSize = -s "$expectedDir/$base-$expectedTag.png";
+        if ($expectedHash ne $actualHash && -f "$expectedPixelDir/$base-$expectedTag.png") {
+            my $expectedPNGSize = -s "$expectedPixelDir/$base-$expectedTag.png";
             my $expectedPNG = "";
-            open EXPECTEDPNG, "$expectedDir/$base-$expectedTag.png";
+            open EXPECTEDPNG, "$expectedPixelDir/$base-$expectedTag.png";
             read(EXPECTEDPNG, $expectedPNG, $expectedPNGSize);
 
@@ -590 +592 @@
         }
 
-        if ($actualPNGSize && ($resetResults || !-f "$expectedDir/$base-$expectedTag.png")) {
-            mkpath catfile($expectedDir, dirname($base)) if $testDirectory ne $expectedDir;
-            open EXPECTED, ">", "$expectedDir/$base-expected.png" or die "could not create $expectedDir/$base-expected.png\n";
+        if ($actualPNGSize && ($resetResults || !-f "$expectedPixelDir/$base-$expectedTag.png")) {
+            mkpath catfile($expectedPixelDir, dirname($base)) if $testDirectory ne $expectedPixelDir;
+            open EXPECTED, ">", "$expectedPixelDir/$base-expected.png" or die "could not create $expectedPixelDir/$base-expected.png\n";
             print EXPECTED $actualPNG;
             close EXPECTED;
@@ -598 +600 @@
 
         # update the expected hash if the image diff said that there was no difference
-        if ($actualHash ne "" && ($resetResults || !-f "$expectedDir/$base-$expectedTag.checksum")) {
-            open EXPECTED, ">", "$expectedDir/$base-$expectedTag.checksum" or die "could not create $expectedDir/$base-$expectedTag.checksum\n";
+        if ($actualHash ne "" && ($resetResults || !-f "$expectedPixelDir/$base-$expectedTag.checksum")) {
+            open EXPECTED, ">", "$expectedPixelDir/$base-$expectedTag.checksum" or die "could not create $expectedPixelDir/$base-$expectedTag.checksum\n";
             print EXPECTED $actualHash;
             close EXPECTED;
@@ -1338 +1340 @@
 }
 
-sub expectedDirectoryForTest($;$)
-{
-    my ($base, $isText) = @_;
+sub expectedDirectoryForTest($;$;$)
+{
+    my ($base, $isText, $isPixelTest) = @_;
 
     my @directories = @platformHierarchy;
@@ -1347 +1349 @@
 
     # If we already have expected results, just return their location.
-    foreach my $directory (@directories) {
-        return $directory if (-f "$directory/$base-$expectedTag.txt");
+    if ($isPixelTest) {
+        foreach my $directory (@directories) {
+            return $directory if (-f "$directory/$base-$expectedTag.png");
+        }
+    } else {
+        foreach my $directory (@directories) {
+            return $directory if (-f "$directory/$base-$expectedTag.txt");
+        }
     }