Log Message
Unreviewed, rolling out r121244. http://trac.webkit.org/changeset/121244 https://bugs.webkit.org/show_bug.cgi?id=89966
skip list path is incorrect now. (Requested by Ossy on #webkit). Patch by Sheriff Bot <[email protected]> on 2012-06-26 * Scripts/webkitpy/layout_tests/port/qt.py: (QtPort.baseline_search_path): (QtPort._skipped_file_search_paths): * Scripts/webkitpy/layout_tests/port/qt_unittest.py: (QtPortTest.test_baseline_search_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121246 => 121247)
--- trunk/Tools/ChangeLog 2012-06-26 10:06:34 UTC (rev 121246)
+++ trunk/Tools/ChangeLog 2012-06-26 10:11:28 UTC (rev 121247)
@@ -1,3 +1,18 @@
+2012-06-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r121244.
+ http://trac.webkit.org/changeset/121244
+ https://bugs.webkit.org/show_bug.cgi?id=89966
+
+ skip list path is incorrect now. (Requested by Ossy on
+ #webkit).
+
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ (QtPort.baseline_search_path):
+ (QtPort._skipped_file_search_paths):
+ * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
+ (QtPortTest.test_baseline_search_path):
+
2012-06-26 János Badics <[email protected]>
[Qt][NRWT] Fix baseline and skipped file search path.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (121246 => 121247)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-06-26 10:06:34 UTC (rev 121246)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-06-26 10:11:28 UTC (rev 121247)
@@ -106,16 +106,7 @@
version = '4.8'
return version
- def _search_paths(self):
- # Qt port uses same paths for baseline_search_path and _skipped_file_search_paths
- #
- # qt-5.0-wk1 qt-5.0-wk2
- # \/
- # qt-5.0 qt-4.8
- # \/
- # (qt-linux|qt-mac|qt-win)
- # |
- # qt
+ def baseline_search_path(self):
search_paths = []
version = self.qt_version()
if '5.0' in version:
@@ -123,21 +114,26 @@
search_paths.append('qt-5.0-wk2')
else:
search_paths.append('qt-5.0-wk1')
+ search_paths.append(self.name())
if '4.8' in version:
search_paths.append('qt-4.8')
elif version:
search_paths.append('qt-5.0')
- search_paths.append(self.port_name + '-' + self.host.platform.os_name)
search_paths.append(self.port_name)
- return search_paths
+ return map(self._webkit_baseline_path, search_paths)
- def baseline_search_path(self):
- return map(self._webkit_baseline_path, self._search_paths())
-
def _skipped_file_search_paths(self):
- skipped_path = self._search_paths()
- skipped_path.append('wk2')
- return skipped_path
+ search_paths = set([self.port_name, self.name()])
+ version = self.qt_version()
+ if '4.8' in version:
+ search_paths.add('qt-4.8')
+ elif version:
+ search_paths.add('qt-5.0')
+ if self.get_option('webkit_test_runner'):
+ search_paths.update(['qt-5.0-wk2', 'wk2'])
+ else:
+ search_paths.add('qt-5.0-wk1')
+ return search_paths
def setup_environ_for_server(self, server_name=None):
clean_env = WebKitPort.setup_environ_for_server(self, server_name)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py (121246 => 121247)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2012-06-26 10:06:34 UTC (rev 121246)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2012-06-26 10:11:28 UTC (rev 121247)
@@ -60,21 +60,21 @@
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-4.8', 'qt-mac', 'qt'], 'mac', qt_version='4.8')
- self._assert_search_path(['qt-4.8', 'qt-win', 'qt'], 'win', qt_version='4.8')
- self._assert_search_path(['qt-4.8', 'qt-linux', 'qt'], '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-mac', 'qt'], 'mac')
- self._assert_search_path(['qt-4.8', 'qt-win', 'qt'], 'win')
- self._assert_search_path(['qt-4.8', 'qt-linux', 'qt'], 'linux')
+ 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-5.0-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'mac', use_webkit2=True, qt_version='5.0')
- self._assert_search_path(['qt-5.0-wk2', 'qt-5.0', 'qt-win', 'qt'], 'win', use_webkit2=True, qt_version='5.0')
- self._assert_search_path(['qt-5.0-wk2', 'qt-5.0', 'qt-linux', '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')
- self._assert_search_path(['qt-5.0-wk1', 'qt-5.0', 'qt-mac', 'qt'], 'mac', use_webkit2=False, qt_version='5.0')
- self._assert_search_path(['qt-5.0-wk1', 'qt-5.0', 'qt-win', 'qt'], 'win', use_webkit2=False, qt_version='5.0')
- self._assert_search_path(['qt-5.0-wk1', 'qt-5.0', 'qt-linux', 'qt'], 'linux', use_webkit2=False, qt_version='5.0')
+ self._assert_search_path(['qt-5.0-wk1', 'qt-mac', 'qt-5.0', 'qt'], 'mac', use_webkit2=False, qt_version='5.0')
+ self._assert_search_path(['qt-5.0-wk1', 'qt-win', 'qt-5.0', 'qt'], 'win', use_webkit2=False, qt_version='5.0')
+ self._assert_search_path(['qt-5.0-wk1', 'qt-linux', 'qt-5.0', 'qt'], 'linux', use_webkit2=False, qt_version='5.0')
def test_show_results_html_file(self):
port = self.make_port()
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
