Changeset 121244 in webkit


Ignore:
Timestamp:
Jun 26, 2012 2:42:06 AM (12 years ago)
Author:
commit-queue@webkit.org
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-26
Reviewed by Csaba Osztrogonác.

  • Scripts/webkitpy/layout_tests/port/qt.py:

(QtPort.baseline_search_path):

  • Scripts/webkitpy/layout_tests/port/qt_unittest.py:

(QtPortTest.test_baseline_search_path):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r121241 r121244  
     12012-06-26  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.baseline_search_path):
     10        * Scripts/webkitpy/layout_tests/port/qt_unittest.py:
     11        (QtPortTest.test_baseline_search_path):
     12
    1132012-06-26  Tony Chang  <tony@chromium.org>
    214
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py

    r121239 r121244  
    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        skipped_path.append('wk2')
     140        return skipped_path
    137141
    138142    def setup_environ_for_server(self, server_name=None):
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py

    r118898 r121244  
    6161
    6262    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')
     63        self._assert_search_path(['qt-4.8', 'qt-mac', 'qt'], 'mac', qt_version='4.8')
     64        self._assert_search_path(['qt-4.8', 'qt-win', 'qt'], 'win', qt_version='4.8')
     65        self._assert_search_path(['qt-4.8', 'qt-linux', 'qt'], 'linux', qt_version='4.8')
    6666
    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')
     67        self._assert_search_path(['qt-4.8', 'qt-mac', 'qt'], 'mac')
     68        self._assert_search_path(['qt-4.8', 'qt-win', 'qt'], 'win')
     69        self._assert_search_path(['qt-4.8', 'qt-linux', 'qt'], 'linux')
    7070
    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')
     71        self._assert_search_path(['qt-5.0-wk2', 'qt-5.0', 'qt-mac', 'qt'], 'mac', use_webkit2=True, qt_version='5.0')
     72        self._assert_search_path(['qt-5.0-wk2', 'qt-5.0', 'qt-win', 'qt'], 'win', use_webkit2=True, qt_version='5.0')
     73        self._assert_search_path(['qt-5.0-wk2', 'qt-5.0', 'qt-linux', 'qt'], 'linux', use_webkit2=True, qt_version='5.0')
    7474
    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')
     75        self._assert_search_path(['qt-5.0-wk1', 'qt-5.0', 'qt-mac', 'qt'], 'mac', use_webkit2=False, qt_version='5.0')
     76        self._assert_search_path(['qt-5.0-wk1', 'qt-5.0', 'qt-win', 'qt'], 'win', use_webkit2=False, qt_version='5.0')
     77        self._assert_search_path(['qt-5.0-wk1', 'qt-5.0', 'qt-linux', 'qt'], 'linux', use_webkit2=False, qt_version='5.0')
    7878
    7979    def test_show_results_html_file(self):
Note: See TracChangeset for help on using the changeset viewer.