Unreviewed, rolling out r110250.

http://trac.webkit.org/changeset/110250
https://bugs.webkit.org/show_bug.cgi?id=80682

It made NRWT ignore test_expectations.txt on Qt-WK2 and ignore
qt-linux at all. (Requested by Ossy on #webkit).

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

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

Canonical link: https://commits.webkit.org/97869@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

@@ -1,3 +1,22 @@
+2012-03-09  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r110250.
+        http://trac.webkit.org/changeset/110250
+        https://bugs.webkit.org/show_bug.cgi?id=80682
+
+        It made NRWT ignore test_expectations.txt on Qt-WK2 and ignore
+        qt-linux at all. (Requested by Ossy on #webkit).
+
+        * Scripts/old-run-webkit-tests:
+        * Scripts/webkitpy/layout_tests/port/qt.py:
+        (QtPort):
+        (QtPort.determine_full_port_name):
+        (QtPort.baseline_search_path):
+        * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
+        (QtPortTest):
+        (QtPortTest._assert_search_path):
+        (QtPortTest.test_baseline_search_path):
+
 2012-03-08  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Use Qt's module system for install rules and depending on QtWebKit

Tools/Scripts/old-run-webkit-tests

@@ -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;

Tools/Scripts/webkitpy/layout_tests/port/qt.py

@@ -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,9 +57,7 @@ def _port_flag_for_scripts(self):
     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 cls.port_name + '-' + host.platform.os_name
+        return port_name + '-' + host.platform.os_name
 
     # sys_platform exists only for unit testing.
     def __init__(self, host, port_name, **kwargs):
@@ -111,6 +108,8 @@ def qt_version(self):
 
     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:

Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py

@@ -38,18 +38,18 @@
 
 
 class QtPortTest(port_testcase.PortTestCase):
-    port_name = 'qt'
+    port_name = 'qt-mac'
     port_maker = QtPort
 
-    def _assert_search_path(self, search_paths, os_name=None, override_platform=None, use_webkit2=False, qt_version='4.8'):
+    def _assert_search_path(self, search_paths, os_name=None, use_webkit2=False, qt_version='4.8'):
         # FIXME: Port constructors should not "parse" the port name, but
         # rather be passed components (directly or via setters).  Once
         # we fix that, this method will need a re-write.
         host = MockSystemHost(os_name=os_name)
         host.executive = MockExecutive2(self._qt_version(qt_version))
-        options = MockOptions(webkit_test_runner=use_webkit2, platform='qt')
-        port_name = QtPort.determine_full_port_name(host=host, options=options, port_name=override_platform)
-        port = self.make_port(host=host, qt_version=qt_version, port_name=port_name, options=options)
+        port_name = 'qt-' + os_name
+        port = self.make_port(host=host, qt_version=qt_version, port_name=port_name,
+                              options=MockOptions(webkit_test_runner=use_webkit2, platform='qt'))
         absolute_search_paths = map(port._webkit_baseline_path, search_paths)
         self.assertEquals(port.baseline_search_path(), absolute_search_paths)
 
@@ -60,25 +60,17 @@ def _qt_version(self, qt_version):
             return 'QMake version 2.01a\nUsing Qt version 5.0.0 in /usr/local/Trolltech/Qt-5.0.0/lib'
 
     def test_baseline_search_path(self):
-        self._assert_search_path(['qt-mac', 'qt-4.8', 'qt'], os_name='mac', qt_version='4.8')
-        self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], os_name='win', qt_version='4.8')
-        self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], os_name='linux', qt_version='4.8')
+        self._assert_search_path(['qt-mac', 'qt-4.8', 'qt'], 'mac', qt_version='4.8')
+        self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], 'win', qt_version='4.8')
+        self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], 'linux', qt_version='4.8')
 
-        self._assert_search_path(['qt-4.8', 'qt-4.8', 'qt'], os_name='mac', override_platform='qt-4.8', qt_version='4.8')
-        self._assert_search_path(['qt-4.8', 'qt-4.8', 'qt'], os_name='win', override_platform='qt-4.8', qt_version='4.8')
-        self._assert_search_path(['qt-4.8', 'qt-4.8', 'qt'], os_name='linux', override_platform='qt-4.8', qt_version='4.8')
+        self._assert_search_path(['qt-mac', 'qt-4.8', 'qt'], 'mac')
+        self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], 'win')
+        self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], 'linux')
 
-        self._assert_search_path(['qt-mac', 'qt-4.8', 'qt'], os_name='mac')
-        self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], os_name='win')
-        self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], os_name='linux')
-
-        self._assert_search_path(['qt-5.0-wk2', 'qt-5.0', 'qt'], os_name='mac', use_webkit2=True, qt_version='5.0')
-        self._assert_search_path(['qt-5.0-wk2', 'qt-5.0', 'qt'], os_name='win', use_webkit2=True, qt_version='5.0')
-        self._assert_search_path(['qt-5.0-wk2', 'qt-5.0', 'qt'], os_name='linux', use_webkit2=True, qt_version='5.0')
-
-        self._assert_search_path(['qt-mac', 'qt-5.0', 'qt'], os_name='mac', override_platform='qt-mac', use_webkit2=True, qt_version='5.0')
-        self._assert_search_path(['qt-win', 'qt-5.0', 'qt'], os_name='win', override_platform='qt-win', use_webkit2=True, qt_version='5.0')
-        self._assert_search_path(['qt-linux', 'qt-5.0', 'qt'], os_name='linux', override_platform='qt-linux', use_webkit2=True, qt_version='5.0')
+        self._assert_search_path(['qt-5.0-wk2', 'qt-mac', 'qt-5.0', 'qt'], 'mac', use_webkit2=True, qt_version='5.0')
+        self._assert_search_path(['qt-5.0-wk2', 'qt-win', 'qt-5.0', 'qt'], 'win', use_webkit2=True, qt_version='5.0')
+        self._assert_search_path(['qt-5.0-wk2', 'qt-linux', 'qt-5.0', 'qt'], 'linux', use_webkit2=True, qt_version='5.0')
 
     def test_show_results_html_file(self):
         port = self.make_port()