Unreviewed, rolling out r110115.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Mar 2012 09:51:05 +0000 (09:51 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Mar 2012 09:51:05 +0000 (09:51 +0000)
http://trac.webkit.org/changeset/110115
https://bugs.webkit.org/show_bug.cgi?id=80581

broke test-webkitpy (Requested by philn-tp on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-03-08

* Scripts/old-run-webkit-tests:
* Scripts/webkitpy/layout_tests/port/qt.py:
(QtPort):
(QtPort.determine_full_port_name):
(QtPort.baseline_search_path):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110157 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/old-run-webkit-tests
Tools/Scripts/webkitpy/layout_tests/port/qt.py

index b1bc093..12eadb3 100644 (file)
@@ -1,3 +1,17 @@
+2012-03-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r110115.
+        http://trac.webkit.org/changeset/110115
+        https://bugs.webkit.org/show_bug.cgi?id=80581
+
+        broke test-webkitpy (Requested by philn-tp on #webkit).
+
+        * Scripts/old-run-webkit-tests:
+        * Scripts/webkitpy/layout_tests/port/qt.py:
+        (QtPort):
+        (QtPort.determine_full_port_name):
+        (QtPort.baseline_search_path):
+
 2012-03-08  Kentaro Hara  <haraken@chromium.org>
 
         Unreviewed. Added myself to watchlist.
index aee639f..9670b77 100755 (executable)
@@ -232,11 +232,7 @@ if (isAppleMacWebKit()) {
         $platform = "mac";
     }
 } elsif (isQt()) {
-    if (getQtVersion() lt "5.0") {
-        $platform = "qt-4.8";
-    } else {
-        $platform = "qt-5.0-wk1";
-    }
+    $platform = "qt";
 } elsif (isGtk()) {
     $platform = "gtk";
 } elsif (isWx()) {
@@ -332,23 +328,6 @@ EOF
 
 setConfiguration();
 
-if ($useWebKitTestRunner) {
-    if (isAppleMacWebKit()) {
-        $realPlatform = $platform;
-        $platform = "mac-wk2";
-    } elsif (isAppleWinWebKit()) {
-        $stripEditingCallbacks = 0 unless defined $stripEditingCallbacks;
-        $realPlatform = $platform;
-        $platform = "win-wk2";
-    } elsif (isQt()) {
-        $realPlatform = $platform;
-        $platform = "qt-5.0-wk2";
-    } elsif (isGtk()) {
-        $realPlatform = $platform;
-        $platform = "gtk-wk2";
-    }
-}
-
 my $getOptionsResult = GetOptions(
     'add-platform-exceptions' => \$addPlatformExceptions,
     'additional-platform-directory=s' => \@additionalPlatformDirectories,
@@ -403,6 +382,23 @@ if (!$getOptionsResult || $showHelp) {
     exit 1;
 }
 
+if ($useWebKitTestRunner) {
+    if (isAppleMacWebKit()) {
+        $realPlatform = $platform;
+        $platform = "mac-wk2";
+    } elsif (isAppleWinWebKit()) {
+        $stripEditingCallbacks = 0 unless defined $stripEditingCallbacks;
+        $realPlatform = $platform;
+        $platform = "win-wk2";
+    } elsif (isQt()) {
+        $realPlatform = $platform;
+        $platform = "qt-5.0-wk2";
+    } elsif (isGtk()) {
+        $realPlatform = $platform;
+        $platform = "gtk-wk2";
+    }
+}
+
 $timeoutSeconds *= 10 if $guardMalloc;
 
 $stripEditingCallbacks = isCygwin() unless defined $stripEditingCallbacks;
index edb9f0f..5fc60a5 100644 (file)
@@ -47,7 +47,6 @@ class QtPort(WebKitPort):
     ALL_VERSIONS = ['linux', 'win', 'mac']
     port_name = "qt"
 
-    @classmethod
     def _wk2_port_name(self):
         return "qt-5.0-wk2"
 
@@ -58,8 +57,6 @@ class QtPort(WebKitPort):
     def determine_full_port_name(cls, host, options, port_name):
         if port_name and port_name != cls.port_name:
             return port_name
-        if hasattr(options, 'webkit_test_runner') and getattr(options, 'webkit_test_runner'):
-            return cls._wk2_port_name()
         return port_name + '-' + host.platform.os_name
 
     # sys_platform exists only for unit testing.
@@ -111,6 +108,8 @@ class QtPort(WebKitPort):
 
     def baseline_search_path(self):
         search_paths = []
+        if self.get_option('webkit_test_runner'):
+            search_paths.append(self._wk2_port_name())
         search_paths.append(self.name())
         version = self.qt_version()
         if '4.8' in version: