REGRESSION(r154275): webkitpy tests failing
authorallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Aug 2013 15:27:54 +0000 (15:27 +0000)
committerallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Aug 2013 15:27:54 +0000 (15:27 +0000)
https://bugs.webkit.org/show_bug.cgi?id=120010

Reviewed by Jocelyn Turcotte.

Update unit-tests to tests the new search-path structure,
but reverting the architecture search path addition.

* Scripts/webkitpy/port/qt.py:
(QtPort):
(QtPort.__init__):
(QtPort._generate_all_test_configurations):
(QtPort.qt_architecture):
* Scripts/webkitpy/port/qt_unittest.py:
(QtPortTest):
(QtPortTest._assert_search_path):
(QtPortTest._assert_expectations_files):
(QtPortTest._qt_version):

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

Tools/ChangeLog
Tools/Scripts/webkitpy/port/qt.py
Tools/Scripts/webkitpy/port/qt_unittest.py

index b2ed5bb..b1aed76 100644 (file)
@@ -1,5 +1,26 @@
 2013-08-19  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
+        REGRESSION(r154275): webkitpy tests failing
+        https://bugs.webkit.org/show_bug.cgi?id=120010
+
+        Reviewed by Jocelyn Turcotte.
+
+        Update unit-tests to tests the new search-path structure,
+        but reverting the architecture search path addition.
+
+        * Scripts/webkitpy/port/qt.py:
+        (QtPort):
+        (QtPort.__init__):
+        (QtPort._generate_all_test_configurations):
+        (QtPort.qt_architecture):
+        * Scripts/webkitpy/port/qt_unittest.py:
+        (QtPortTest):
+        (QtPortTest._assert_search_path):
+        (QtPortTest._assert_expectations_files):
+        (QtPortTest._qt_version):
+
+2013-08-19  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
         [Qt] Keep the qt-5.0-wk2 search path until the expectation migration is completed
 
         Unreviewed meta gardening.
index 7320d0a..6d82d54 100644 (file)
@@ -116,24 +116,12 @@ class QtPort(Port):
             version = '5.0'
         return version
 
-    def architecture(self):
-        py_machine = platform.machine()
-        if 'i386' == py_machine:
-            return 'x86'
-        if 'x86_64' == py_machine:
-            return 'x64'
-        if 'arm' in py_machine:
-            return 'arm'
-        return ''
-
     def _search_paths(self):
         #                 qt-mac-wk2
         #                /
         #       qt-wk1  qt-wk2
         #             \/
         #           qt-5.x
-        #              |
-        #     (qt-x86|qt-x64|qt-arm)
         #               \
         #    (qt-linux|qt-mac|qt-win)
         #                |
@@ -150,10 +138,6 @@ class QtPort(Port):
 
         search_paths.append('qt-' + self.qt_version())
 
-        architecture = self.architecture();
-        if architecture:
-            search_paths.append('qt-' + architecture)
-
         search_paths.append(self.port_name + '-' + self.operating_system())
         search_paths.append(self.port_name)
         return search_paths
@@ -167,7 +151,7 @@ class QtPort(Port):
             paths.append('wk2')
 
         # expectations_files() uses the directories listed in _search_paths reversed.
-        # e.g. qt -> qt-linux -> qt-x86 -> qt-5.x -> qt-wk1
+        # e.g. qt -> qt-linux -> qt-5.x -> qt-wk1
         return list(reversed([self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in paths]))
 
     def setup_environ_for_server(self, server_name=None):
index a0e7ceb..0f0f5f1 100644 (file)
@@ -42,13 +42,14 @@ class QtPortTest(port_testcase.PortTestCase):
     port_name = 'qt-mac'
     port_maker = QtPort
     search_paths_cases = [
-        {'search_paths':['qt-5.0-mac-wk2', 'qt-5.0-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':True, 'qt_version':'5.0'},
-        {'search_paths':['qt-5.0-wk2', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':True, 'qt_version':'5.0'},
-        {'search_paths':['qt-5.0-wk2', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':True, 'qt_version':'5.0'},
-
-        {'search_paths':['qt-5.0-wk1', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':False, 'qt_version':'5.0'},
-        {'search_paths':['qt-5.0-wk1', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False, 'qt_version':'5.0'},
-        {'search_paths':['qt-5.0-wk1', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False, 'qt_version':'5.0'},
+        {'search_paths':['qt-mac-wk2', 'qt-wk2', 'qt-5.0-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':True, 'qt_version':'5.0'},
+        {'search_paths':['qt-wk2', 'qt-5.0-wk2', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':True, 'qt_version':'5.0'},
+        {'search_paths':['qt-wk2', 'qt-5.0-wk2', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':True, 'qt_version':'5.0'},
+
+        {'search_paths':['qt-wk1', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':False, 'qt_version':'5.0'},
+        {'search_paths':['qt-wk1', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False, 'qt_version':'5.0'},
+        {'search_paths':['qt-wk1', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False, 'qt_version':'5.0'},
+        {'search_paths':['qt-wk1', 'qt-5.1', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False, 'qt_version':'5.1'},
     ]
 
     def _assert_search_path(self, search_paths, os_name, use_webkit2=False, qt_version='5.0'):
@@ -77,6 +78,8 @@ class QtPortTest(port_testcase.PortTestCase):
     def _qt_version(self, qt_version):
         if qt_version in '5.0':
             return 'QMake version 2.01a\nUsing Qt version 5.0.0 in /usr/local/Trolltech/Qt-5.0.0/lib'
+        if qt_version in '5.1':
+            return 'QMake version 3.0\nUsing Qt version 5.1.1 in /usr/local/Qt-5.1/lib'
 
     def test_baseline_search_path(self):
         for case in self.search_paths_cases: