Changeset 121430 in webkit


Ignore:
Timestamp:
Jun 28, 2012 7:33:11 AM (12 years ago)
Author:
Csaba Osztrogonác
Message:

[Qt][NRWT] Fix baseline and skipped file search path.
https://bugs.webkit.org/show_bug.cgi?id=89882

Patch by János Badics <János Badics> 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):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r121429 r121430  
     12012-06-28  János Badics  <jbadics@inf.u-szeged.hu>
     2
     3        [Qt][NRWT] Fix baseline and skipped file search path.
     4        https://bugs.webkit.org/show_bug.cgi?id=89882
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        * Scripts/webkitpy/layout_tests/port/qt.py:
     9        (QtPort._search_paths):
     10        (QtPort):
     11        (QtPort.baseline_search_path):
     12        (QtPort._skipped_file_search_paths):
     13        * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
     14        (QtPortTest):
     15        (QtPortTest._assert_skipped_path):
     16        (QtPortTest.test_baseline_search_path):
     17        (QtPortTest.test_skipped_file_search_path):
     18
    1192012-06-28  Alexander Pavlov  <apavlov@chromium.org>
    220
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py

    r121247 r121430  
    107107        return version
    108108
    109     def baseline_search_path(self):
     109    def _search_paths(self):
     110        # Qt port uses same paths for baseline_search_path and _skipped_file_search_paths
     111        #
     112        # qt-5.0-wk1    qt-5.0-wk2
     113        #            \/
     114        #         qt-5.0    qt-4.8
     115        #                \/
     116        #    (qt-linux|qt-mac|qt-win)
     117        #                |
     118        #               qt
    110119        search_paths = []
    111120        version = self.qt_version()
     
    115124            else:
    116125                search_paths.append('qt-5.0-wk1')
    117         search_paths.append(self.name())
    118126        if '4.8' in version:
    119127            search_paths.append('qt-4.8')
    120128        elif version:
    121129            search_paths.append('qt-5.0')
     130        search_paths.append(self.port_name + '-' + self.host.platform.os_name)
    122131        search_paths.append(self.port_name)
    123         return map(self._webkit_baseline_path, search_paths)
     132        return search_paths
     133
     134    def baseline_search_path(self):
     135        return map(self._webkit_baseline_path, self._search_paths())
    124136
    125137    def _skipped_file_search_paths(self):
    126         search_paths = set([self.port_name, self.name()])
    127         version = self.qt_version()
    128         if '4.8' in version:
    129             search_paths.add('qt-4.8')
    130         elif version:
    131             search_paths.add('qt-5.0')
    132             if self.get_option('webkit_test_runner'):
    133                 search_paths.update(['qt-5.0-wk2', 'wk2'])
    134             else:
    135                 search_paths.add('qt-5.0-wk1')
    136         return search_paths
     138        skipped_path = self._search_paths()
     139        if self.get_option('webkit_test_runner') and '5.0' in self.qt_version():
     140            skipped_path.append('wk2')
     141        return skipped_path
    137142
    138143    def setup_environ_for_server(self, server_name=None):
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py

    r121247 r121430  
    4141    port_name = 'qt-mac'
    4242    port_maker = QtPort
     43    search_paths_cases = [
     44        {'search_paths':['qt-4.8', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':False, 'qt_version':'4.8'},
     45        {'search_paths':['qt-4.8', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False, 'qt_version':'4.8'},
     46        {'search_paths':['qt-4.8', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False, 'qt_version':'4.8'},
     47
     48        {'search_paths':['qt-4.8', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':False},
     49        {'search_paths':['qt-4.8', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False},
     50        {'search_paths':['qt-4.8', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False},
     51
     52        {'search_paths':['qt-5.0-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':True, 'qt_version':'5.0'},
     53        {'search_paths':['qt-5.0-wk2', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':True, 'qt_version':'5.0'},
     54        {'search_paths':['qt-5.0-wk2', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':True, 'qt_version':'5.0'},
     55
     56        {'search_paths':['qt-5.0-wk1', 'qt-5.0', 'qt-mac', 'qt'], 'os_name':'mac', 'use_webkit2':False, 'qt_version':'5.0'},
     57        {'search_paths':['qt-5.0-wk1', 'qt-5.0', 'qt-win', 'qt'], 'os_name':'win', 'use_webkit2':False, 'qt_version':'5.0'},
     58        {'search_paths':['qt-5.0-wk1', 'qt-5.0', 'qt-linux', 'qt'], 'os_name':'linux', 'use_webkit2':False, 'qt_version':'5.0'},
     59    ]
    4360
    4461    def _assert_search_path(self, search_paths, os_name=None, use_webkit2=False, qt_version='4.8'):
     
    5471        self.assertEquals(port.baseline_search_path(), absolute_search_paths)
    5572
     73    def _assert_skipped_path(self, search_paths, os_name=None, use_webkit2=False, qt_version='4.8'):
     74        host = MockSystemHost(os_name=os_name)
     75        host.executive = MockExecutive2(self._qt_version(qt_version))
     76        port_name = 'qt-' + os_name
     77        port = self.make_port(host=host, qt_version=qt_version, port_name=port_name,
     78                              options=MockOptions(webkit_test_runner=use_webkit2, platform='qt'))
     79        self.assertEquals(port._skipped_file_search_paths(), search_paths)
     80
    5681    def _qt_version(self, qt_version):
    5782        if qt_version in '4.8':
     
    6186
    6287    def test_baseline_search_path(self):
    63         self._assert_search_path(['qt-mac', 'qt-4.8', 'qt'], 'mac', qt_version='4.8')
    64         self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], 'win', qt_version='4.8')
    65         self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], 'linux', qt_version='4.8')
     88        for case in self.search_paths_cases:
     89            self._assert_search_path(**case)
    6690
    67         self._assert_search_path(['qt-mac', 'qt-4.8', 'qt'], 'mac')
    68         self._assert_search_path(['qt-win', 'qt-4.8', 'qt'], 'win')
    69         self._assert_search_path(['qt-linux', 'qt-4.8', 'qt'], 'linux')
    70 
    71         self._assert_search_path(['qt-5.0-wk2', 'qt-mac', 'qt-5.0', 'qt'], 'mac', use_webkit2=True, qt_version='5.0')
    72         self._assert_search_path(['qt-5.0-wk2', 'qt-win', 'qt-5.0', 'qt'], 'win', use_webkit2=True, qt_version='5.0')
    73         self._assert_search_path(['qt-5.0-wk2', 'qt-linux', 'qt-5.0', 'qt'], 'linux', use_webkit2=True, qt_version='5.0')
    74 
    75         self._assert_search_path(['qt-5.0-wk1', 'qt-mac', 'qt-5.0', 'qt'], 'mac', use_webkit2=False, qt_version='5.0')
    76         self._assert_search_path(['qt-5.0-wk1', 'qt-win', 'qt-5.0', 'qt'], 'win', use_webkit2=False, qt_version='5.0')
    77         self._assert_search_path(['qt-5.0-wk1', 'qt-linux', 'qt-5.0', 'qt'], 'linux', use_webkit2=False, qt_version='5.0')
     91    def test_skipped_file_search_path(self):
     92        caselist = self.search_paths_cases[:]
     93        for case in caselist:
     94            if case['use_webkit2'] and case['qt_version'] == '5.0':
     95                case['search_paths'].append("wk2")
     96            self._assert_skipped_path(**case)
    7897
    7998    def test_show_results_html_file(self):
Note: See TracChangeset for help on using the changeset viewer.