Log Message
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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (154279 => 154280)
--- trunk/Tools/ChangeLog 2013-08-19 13:59:14 UTC (rev 154279)
+++ trunk/Tools/ChangeLog 2013-08-19 15:27:54 UTC (rev 154280)
@@ -1,5 +1,26 @@
2013-08-19 Allan Sandfeld Jensen <[email protected]>
+ 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 <[email protected]>
+
[Qt] Keep the qt-5.0-wk2 search path until the expectation migration is completed
Unreviewed meta gardening.
Modified: trunk/Tools/Scripts/webkitpy/port/qt.py (154279 => 154280)
--- trunk/Tools/Scripts/webkitpy/port/qt.py 2013-08-19 13:59:14 UTC (rev 154279)
+++ trunk/Tools/Scripts/webkitpy/port/qt.py 2013-08-19 15:27:54 UTC (rev 154280)
@@ -116,24 +116,12 @@
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 @@
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 @@
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):
Modified: trunk/Tools/Scripts/webkitpy/port/qt_unittest.py (154279 => 154280)
--- trunk/Tools/Scripts/webkitpy/port/qt_unittest.py 2013-08-19 13:59:14 UTC (rev 154279)
+++ trunk/Tools/Scripts/webkitpy/port/qt_unittest.py 2013-08-19 15:27:54 UTC (rev 154280)
@@ -42,13 +42,14 @@
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-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-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-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 @@
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:
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
