Log Message
[Qt][NRWT] Fix baseline and skipped file search path. https://bugs.webkit.org/show_bug.cgi?id=89882
Patch by János Badics <[email protected]> on 2012-06-28 Reviewed by Csaba Osztrogonác. * Scripts/webkitpy/layout_tests/port/qt.py: (QtPort._search_paths): (QtPort): (QtPort.baseline_search_path): (QtPort._skipped_file_search_paths): * Scripts/webkitpy/layout_tests/port/qt_unittest.py: (QtPortTest): (QtPortTest._assert_skipped_path): (QtPortTest.test_baseline_search_path): (QtPortTest.test_skipped_file_search_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121429 => 121430)
--- trunk/Tools/ChangeLog 2012-06-28 14:27:27 UTC (rev 121429)
+++ trunk/Tools/ChangeLog 2012-06-28 14:33:11 UTC (rev 121430)
@@ -1,3 +1,21 @@
+2012-06-28 János Badics <[email protected]>
+
+ [Qt][NRWT] Fix baseline and skipped file search path.
+ https://bugs.webkit.org/show_bug.cgi?id=89882
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ (QtPort._search_paths):
+ (QtPort):
+ (QtPort.baseline_search_path):
+ (QtPort._skipped_file_search_paths):
+ * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
+ (QtPortTest):
+ (QtPortTest._assert_skipped_path):
+ (QtPortTest.test_baseline_search_path):
+ (QtPortTest.test_skipped_file_search_path):
+
2012-06-28 Alexander Pavlov <[email protected]>
[Qt] inspector/styles/inject-stylesheet.html makes 4 tests flakey (TEXT PASS)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (121429 => 121430)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-06-28 14:27:27 UTC (rev 121429)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-06-28 14:33:11 UTC (rev 121430)
@@ -106,7 +106,16 @@
version = '4.8'
return version
- def baseline_search_path(self):
+ 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
search_paths = []
version = self.qt_version()
if '5.0' in version:
@@ -114,26 +123,22 @@
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 map(self._webkit_baseline_path, search_paths)
+ return search_paths
+ def baseline_search_path(self):
+ return map(self._webkit_baseline_path, self._search_paths())
+
def _skipped_file_search_paths(self):
- 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
+ skipped_path = self._search_paths()
+ if self.get_option('webkit_test_runner') and '5.0' in self.qt_version():
+ skipped_path.append('wk2')
+ return skipped_path
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 (121429 => 121430)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2012-06-28 14:27:27 UTC (rev 121429)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2012-06-28 14:33:11 UTC (rev 121430)
@@ -40,7 +40,24 @@
class QtPortTest(port_testcase.PortTestCase):
port_name = 'qt-mac'
port_maker = QtPort
+ search_paths_cases = [
+ {'search_paths':['qt-4.8', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':False, 'qt_version':'4.8'},
+ {'search_paths':['qt-4.8', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False, 'qt_version':'4.8'},
+ {'search_paths':['qt-4.8', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False, 'qt_version':'4.8'},
+ {'search_paths':['qt-4.8', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':False},
+ {'search_paths':['qt-4.8', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False},
+ {'search_paths':['qt-4.8', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False},
+
+ {'search_paths':['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'},
+ ]
+
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
@@ -53,6 +70,14 @@
absolute_search_paths = map(port._webkit_baseline_path, search_paths)
self.assertEquals(port.baseline_search_path(), absolute_search_paths)
+ def _assert_skipped_path(self, search_paths, os_name=None, use_webkit2=False, qt_version='4.8'):
+ host = MockSystemHost(os_name=os_name)
+ host.executive = MockExecutive2(self._qt_version(qt_version))
+ 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'))
+ self.assertEquals(port._skipped_file_search_paths(), search_paths)
+
def _qt_version(self, qt_version):
if qt_version in '4.8':
return 'QMake version 2.01a\nUsing Qt version 4.8.0 in /usr/local/Trolltech/Qt-4.8.2/lib'
@@ -60,22 +85,16 @@
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'], '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')
+ for case in self.search_paths_cases:
+ self._assert_search_path(**case)
- 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')
+ def test_skipped_file_search_path(self):
+ caselist = self.search_paths_cases[:]
+ for case in caselist:
+ if case['use_webkit2'] and case['qt_version'] == '5.0':
+ case['search_paths'].append("wk2")
+ self._assert_skipped_path(**case)
- 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-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()
port._executive = MockExecutive(should_log=True)
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
