Changeset 102594 in webkit

Timestamp:

Dec 12, 2011 9:48:33 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Fix skip list search path and expected file search path in ORWT
​https://bugs.webkit.org/show_bug.cgi?id=74281

Expected file search path fixed.

Print all used skipped list and expected search path in verbose mode similar to NRWT.

Patch by Ádám Kallai <​Kallai.Adam@stud.u-szeged.hu> on 2011-12-12
Reviewed by Csaba Osztrogonác.

• Scripts/old-run-webkit-tests:

(buildPlatformResultHierarchy):
(buildPlatformTestHierarchy):
(readSkippedFiles):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-12  Ádám Kallai  <Kallai.Adam@stud.u-szeged.hu>
+
+        [Qt] Fix skip list search path and expected file search path in ORWT
+        https://bugs.webkit.org/show_bug.cgi?id=74281
+
+        Expected file search path fixed.
+
+        Print all used skipped list and expected search path in verbose mode similar to NRWT.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/old-run-webkit-tests:
+        (buildPlatformResultHierarchy):
+        (buildPlatformTestHierarchy):
+        (readSkippedFiles):
+
 2011-12-12  Nándor Huszka  <huszka.nandor@stud.u-szeged.hu>
 

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

@@ -233 +233 @@
     }
 } elsif (isQt()) {
-    if (isDarwin()) {
-        $platform = "qt-mac";
-    } elsif (isARM()) {
-        $platform = "qt-arm";
-    } elsif (getQtVersion() eq "4.8") {
-        $platform = "qt-4.8";
-    } elsif (getQtVersion() eq "5.0") {
-        $platform = "qt-5.0";
-    } elsif (isLinux()) {
-        $platform = "qt-linux";
-    } elsif (isWindows() || isCygwin()) {
-        $platform = "qt-win";
-    } else {
-        $platform = "qt";
-    }
+    $platform = "qt";
 } elsif (isGtk()) {
     $platform = "gtk";
@@ -2199 +2185 @@
             @platforms = $platform;
         }
-    } elsif ($platform =~ /^qt-/) {
-        push @platforms, $platform;
+    } elsif ($platform =~ /^qt/) {
+        if ($platform eq "qt-wk2") {
+            push @platforms, $platform;
+        }
+
+        if (isARM() || $platform eq "qt-arm") {
+            push @platforms, "qt-arm";
+        }
+
+        if (isDarwin() || $platform eq "qt-mac") {
+            push @platforms, "qt-mac";
+        }
+        elsif (isWindows() || isCygwin() || $platform eq "qt-win") {
+            push @platforms, "qt-win";
+        }
+        elsif (isLinux() || $platform eq "qt-linux") {
+            push @platforms, "qt-linux";
+        }
+
+        if (getQtVersion() eq "4.8" || $platform eq "qt-4.8") {
+            push @platforms, "qt-4.8";
+        }
+        elsif (getQtVersion() eq "5.0" || $platform eq "qt-5.0") {
+            push @platforms, "qt-5.0";
+        }
+
         push @platforms, "qt";
     } elsif ($platform =~ /^gtk-/) {
@@ -2224 +2234 @@
     my (@platformHierarchy) = @_;
 
-    my $wk2Platform;
-    for (my $i = 0; $i < @platformHierarchy; ++$i) {
-        if ($platformHierarchy[$i] =~ /-wk2/) {
-            $wk2Platform = splice @platformHierarchy, $i, 1;
-            last;
-        }
-    }
-
     my @result;
-    push @result, $platformHierarchy[0];
-    push @result, $wk2Platform if defined $wk2Platform;
-    push @result, $platformHierarchy[$#platformHierarchy] if @platformHierarchy >= 2;
+    if ($platform =~ /^qt/) {
+        for (my $i = 0; $i < @platformHierarchy; ++$i) {
+           push @result, $platformHierarchy[$i];
+        }
+    } else {
+        my $wk2Platform;
+        for (my $i = 0; $i < @platformHierarchy; ++$i) {
+            if ($platformHierarchy[$i] =~ /-wk2/) {
+                $wk2Platform = splice @platformHierarchy, $i, 1;
+                last;
+            }
+        }
+
+       push @result, $platformHierarchy[0];
+       push @result, $wk2Platform if defined $wk2Platform;
+       push @result, $platformHierarchy[$#platformHierarchy] if @platformHierarchy >= 2;
+    }
+
+    if ($verbose) {
+        my @searchPaths;
+        foreach my $searchPath (@result) {
+            my ($dir, $name) = splitpath($searchPath);
+            push @searchPaths, $name;
+        }
+        my $searchPathHierarchy = join(' -> ', @searchPaths);
+        print "Baseline search path: $searchPathHierarchy\n";
+    }
 
     return @result;
@@ -2492 +2518 @@
     # Add Qt WK1-only skipped tests.
     push(@skippedFileDirectories, catdir($platformBaseDirectory, "qt-wk1")) if (isQt() && !$useWebKitTestRunner);
+
+    if ($verbose) {
+        foreach my $skippedPath (@skippedFileDirectories) {
+            print "Using Skipped file: $skippedPath\n";
+        }
+    }
 
     foreach my $level (@skippedFileDirectories) {