Changeset 138314 in webkit


Ignore:
Timestamp:
Dec 20, 2012 4:04:40 PM (11 years ago)
Author:
dpranke@chromium.org
Message:

TestExpectation fallback is broken
https://bugs.webkit.org/show_bug.cgi?id=105583

Reviewed by Ryosuke Niwa.

When I added support for the -wk2 in port names, it looks
like I broke the way we computed the list of TestExpectations
files so that the implementation-version directory was left out :(.
Fixed and cleaned up the tests.

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

(Port.expectations_files):

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

(TestWebKitPort.init):
(PortTestCase.test_skipped_directories_for_symbols):
(test_skipped_directories_for_features):
(test_skipped_directories_for_features_no_matching_tests_in_test_list):
(test_skipped_tests_for_unsupported_features_empty_test_list):
(test_skipped_layout_tests):
(test_expectations_files):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r138305 r138314  
     12012-12-20  Dirk Pranke  <dpranke@chromium.org>
     2
     3        TestExpectation fallback is broken
     4        https://bugs.webkit.org/show_bug.cgi?id=105583
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        When I added support for the -wk2 in port names, it looks
     9        like I broke the way we computed the list of TestExpectations
     10        files so that the implementation-version directory was left out :(.
     11        Fixed and cleaned up the tests.
     12
     13        * Scripts/webkitpy/layout_tests/port/base.py:
     14        (Port.expectations_files):
     15        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
     16        (TestWebKitPort.__init__):
     17        (PortTestCase.test_skipped_directories_for_symbols):
     18        (test_skipped_directories_for_features):
     19        (test_skipped_directories_for_features_no_matching_tests_in_test_list):
     20        (test_skipped_tests_for_unsupported_features_empty_test_list):
     21        (test_skipped_layout_tests):
     22        (test_expectations_files):
     23
    1242012-12-20  Anders Carlsson  <andersca@apple.com>
    225
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

    r138045 r138314  
    10721072        # included via --additional-platform-directory, not the full casade.
    10731073        search_paths = [self.port_name]
    1074         if self.name() != self.port_name:
    1075             search_paths.append(self.name())
     1074
     1075        non_wk2_name = self.name().replace('-wk2', '')
     1076        if non_wk2_name != self.port_name:
     1077            search_paths.append(non_wk2_name)
    10761078
    10771079        if self.get_option('webkit_test_runner'):
    10781080            # Because nearly all of the skipped tests for WebKit 2 are due to cross-platform
    10791081            # issues, all wk2 ports share a skipped list under platform/wk2.
    1080             search_paths.extend([self._wk2_port_name(), "wk2"])
     1082            search_paths.extend(["wk2", self._wk2_port_name()])
    10811083
    10821084        search_paths.extend(self.get_option("additional_platform_directory", []))
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

    r137781 r138314  
    5151    port_name = "testwebkitport"
    5252
    53     def __init__(self, symbols_string=None,
     53    def __init__(self, port_name=None, symbols_string=None,
    5454                 expectations_file=None, skips_file=None, host=None, config=None,
    5555                 **kwargs):
     56        port_name = port_name or TestWebKitPort.port_name
    5657        self.symbols_string = symbols_string  # Passing "" disables all staticly-detectable features.
    5758        host = host or MockSystemHost()
    58         super(TestWebKitPort, self).__init__(host, TestWebKitPort.port_name, **kwargs)
     59        super(TestWebKitPort, self).__init__(host, port_name=port_name, **kwargs)
    5960
    6061    def all_test_configurations(self):
     
    463464        ])
    464465
    465         result_directories = set(TestWebKitPort(symbols_string, None)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html']))
     466        result_directories = set(TestWebKitPort(symbols_string=symbols_string)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html']))
    466467        self.assertEqual(result_directories, expected_directories)
    467468
     
    474475        # Note 'compositing' is not in the list of skipped directories (hence the parsing of GraphicsLayer worked):
    475476        expected_directories = set(['mathml', 'transforms/3d', 'compositing/webgl', 'fast/canvas/webgl', 'animations/3d', 'mhtml', 'http/tests/canvas/webgl', 'fast/css/variables', 'inspector/styles/variables'])
    476         result_directories = set(TestWebKitPort(symbols_string, None)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html']))
     477        result_directories = set(TestWebKitPort(symbols_string=symbols_string)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html']))
    477478        self.assertEqual(result_directories, expected_directories)
    478479
     
    480481        supported_features = ["Accelerated Compositing", "Foo Feature"]
    481482        expected_directories = set(["animations/3d", "transforms/3d"])
    482         port = TestWebKitPort(None, supported_features)
     483        port = TestWebKitPort(supported_features=supported_features)
    483484        port._runtime_feature_list = lambda: supported_features
    484485        result_directories = set(port._skipped_tests_for_unsupported_features(test_list=["animations/3d/foo.html"]))
     
    488489        supported_features = ["Accelerated Compositing", "Foo Feature"]
    489490        expected_directories = set([])
    490         result_directories = set(TestWebKitPort(None, supported_features)._skipped_tests_for_unsupported_features(test_list=['foo.html']))
     491        result_directories = set(TestWebKitPort(supported_features=supported_features)._skipped_tests_for_unsupported_features(test_list=['foo.html']))
    491492        self.assertEqual(result_directories, expected_directories)
    492493
     
    494495        supported_features = ["Accelerated Compositing", "Foo Feature"]
    495496        expected_directories = set([])
    496         result_directories = set(TestWebKitPort(None, supported_features)._skipped_tests_for_unsupported_features(test_list=None))
     497        result_directories = set(TestWebKitPort(supported_features=supported_features)._skipped_tests_for_unsupported_features(test_list=None))
    497498        self.assertEqual(result_directories, expected_directories)
    498499
    499500    def test_skipped_layout_tests(self):
    500         self.assertEqual(TestWebKitPort(None, None).skipped_layout_tests(test_list=[]), set(['media']))
     501        self.assertEqual(TestWebKitPort().skipped_layout_tests(test_list=[]), set(['media']))
    501502
    502503    def test_expectations_files(self):
     
    508509        self.assertEqual(platform_dirs(port), ['testwebkitport'])
    509510
    510         port._name = "testwebkitport-version"
     511        port = TestWebKitPort(port_name="testwebkitport-version")
    511512        self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version'])
    512513
    513         port._options = MockOptions(webkit_test_runner=True)
    514         self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version', 'testwebkitport-wk2', 'wk2'])
    515 
    516         port._options = MockOptions(additional_platform_directory=["internal-testwebkitport"])
     514        port = TestWebKitPort(port_name="testwebkitport-version-wk2")
     515        self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version', 'wk2', 'testwebkitport-wk2'])
     516
     517        port = TestWebKitPort(port_name="testwebkitport-version",
     518                              options=MockOptions(additional_platform_directory=["internal-testwebkitport"]))
    517519        self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version', 'internal-testwebkitport'])
    518520
Note: See TracChangeset for help on using the changeset viewer.