Diff
Modified: trunk/Tools/ChangeLog (132409 => 132410)
--- trunk/Tools/ChangeLog 2012-10-24 22:01:03 UTC (rev 132409)
+++ trunk/Tools/ChangeLog 2012-10-24 22:04:00 UTC (rev 132410)
@@ -1,3 +1,28 @@
+2012-10-24 Dirk Pranke <[email protected]>
+
+ webkitpy: clean up references to Skipped files
+ https://bugs.webkit.org/show_bug.cgi?id=100045
+
+ Reviewed by Ojan Vafai.
+
+ Since they are no longer used or needed ...
+
+ * Scripts/webkitpy/layout_tests/port/apple.py:
+ (ApplePort._generate_all_test_configurations):
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port.skipped_layout_tests):
+ (Port.expectations_files):
+ (Port._wk2_port_name):
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+ (GtkPort):
+ * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+ (MacTest.test_default_timeout_ms):
+ * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+ (test_expectations_files):
+ (test_expectations_files.platform_dirs):
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ (QtPort.__init__):
+
2012-10-24 Jochen Eisinger <[email protected]>
[chromium] Use include paths relative to Source/ in the TestRunner's public API
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py (132409 => 132410)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py 2012-10-24 22:01:03 UTC (rev 132409)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py 2012-10-24 22:04:00 UTC (rev 132410)
@@ -98,6 +98,3 @@
for architecture in self.ARCHITECTURES:
configurations.append(TestConfiguration(version=self._strip_port_name_prefix(port_name), architecture=architecture, build_type=build_type))
return configurations
-
- def expectations_files(self):
- return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpectations') for d in self._skipped_file_search_paths()]
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (132409 => 132410)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-10-24 22:01:03 UTC (rev 132409)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-10-24 22:04:00 UTC (rev 132410)
@@ -697,11 +697,8 @@
return self._filesystem.abspath(self.path_from_webkit_base('.'))
def skipped_layout_tests(self, test_list):
- """Returns the set of tests found in Skipped files. Does *not* include tests marked as SKIP in expectations files."""
- tests_to_skip = set(self._expectations_from_skipped_files(self._skipped_file_search_paths()))
- tests_to_skip.update(self._tests_for_other_platforms())
- tests_to_skip.update(self._skipped_tests_for_unsupported_features(test_list))
- return tests_to_skip
+ """Returns tests skipped outside of the TestExpectations files."""
+ return set(self._tests_for_other_platforms()).union(self._skipped_tests_for_unsupported_features(test_list))
def _tests_from_skipped_file_contents(self, skipped_file_contents):
tests_to_skip = []
@@ -1030,9 +1027,21 @@
return expectations
def expectations_files(self):
- # FIXME: see comment in path_to_expectations_file().
- return [self.path_to_test_expectations_file()]
+ # Unlike baseline_search_path, we only want to search [WK2-PORT, PORT-VERSION, PORT] and any directories
+ # included via --additional-platform-directory, not the full casade.
+ search_paths = [self.port_name]
+ if self.name() != self.port_name:
+ search_paths.append(self.name())
+ if self.get_option('webkit_test_runner'):
+ # Because nearly all of the skipped tests for WebKit 2 are due to cross-platform
+ # issues, all wk2 ports share a skipped list under platform/wk2.
+ search_paths.extend([self._wk2_port_name(), "wk2"])
+
+ search_paths.extend(self.get_option("additional_platform_directory", []))
+
+ return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpectations') for d in search_paths]
+
def repository_paths(self):
"""Returns a list of (repository_name, repository_path) tuples of its depending code base.
By default it returns a list that only contains a ('webkit', <webkitRepossitoryPath>) tuple."""
@@ -1488,27 +1497,7 @@
# except for Qt because WebKit2 is only supported by Qt 5.0 (therefore: qt-5.0-wk2).
return "%s-wk2" % self.port_name
- def _skipped_file_search_paths(self):
- # Unlike baseline_search_path, we only want to search [WK2-PORT, PORT-VERSION, PORT] and any directories
- # included via --additional-platform-directory, not the full casade.
- # Note order doesn't matter since the Skipped file contents are all combined; however
- # we use this order explicitly so we can re-use it for TestExpectations files.
- # FIXME: Update this when we get rid of Skipped files altogether.
- search_paths = set([self.port_name])
- if 'future' not in self.name():
- search_paths.add(self.name())
-
- if self.get_option('webkit_test_runner'):
- # Because nearly all of the skipped tests for WebKit 2 are due to cross-platform
- # issues, all wk2 ports share a skipped list under platform/wk2.
- search_paths.update([self._wk2_port_name(), "wk2"])
-
- search_paths.update(self.get_option("additional_platform_directory", []))
-
- return search_paths
-
-
class VirtualTestSuite(object):
def __init__(self, name, base, args, tests=None):
self.name = name
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (132409 => 132410)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-10-24 22:01:03 UTC (rev 132409)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-10-24 22:04:00 UTC (rev 132410)
@@ -38,9 +38,6 @@
class GtkPort(Port, PulseAudioSanitizer):
port_name = "gtk"
- def expectations_files(self):
- return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpectations') for d in self._skipped_file_search_paths()]
-
def warn_if_bug_missing_in_test_expectations(self):
return True
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py (132409 => 132410)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2012-10-24 22:01:03 UTC (rev 132409)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2012-10-24 22:04:00 UTC (rev 132410)
@@ -49,24 +49,7 @@
super(MacTest, self).test_default_timeout_ms()
self.assertEquals(self.make_port(options=MockOptions(guard_malloc=True)).default_timeout_ms(), 350000)
- def test_expectations_files(self):
- self.assertEquals(len(self.make_port().expectations_files()), 2)
- self.assertEquals(len(self.make_port(options=MockOptions(webkit_test_runner=True)).expectations_files()), 4)
- def test_skipped_file_search_paths(self):
- # We should have two skipped files - platform+version and platform; however, we don't
- # have platform+version for either the most recent version or mac-future.
- self.assert_skipped_file_search_paths('mac-snowleopard', set(['mac-snowleopard', 'mac']))
- self.assert_skipped_file_search_paths('mac-lion', set(['mac-lion', 'mac']))
- self.assert_skipped_file_search_paths('mac-mountainlion', set(['mac']))
- self.assert_skipped_file_search_paths('mac-future', set(['mac']))
-
- self.assert_skipped_file_search_paths('mac-snowleopard', set(['mac-snowleopard', 'mac', 'mac-wk2', 'wk2']), use_webkit2=True)
- self.assert_skipped_file_search_paths('mac-lion', set(['mac', 'mac-lion', 'mac-wk2', 'wk2']), use_webkit2=True)
- self.assert_skipped_file_search_paths('mac-future', set(['mac', 'mac-wk2', 'wk2']), use_webkit2=True)
-
-
-
example_skipped_file = u"""
# <rdar://problem/5647952> fast/events/mouseout-on-window.html needs mac DRT to issue mouse out events
fast/events/mouseout-on-window.html
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py (132409 => 132410)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py 2012-10-24 22:01:03 UTC (rev 132409)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py 2012-10-24 22:04:00 UTC (rev 132410)
@@ -502,15 +502,22 @@
def test_skipped_layout_tests(self):
self.assertEqual(TestWebKitPort(None, None).skipped_layout_tests(test_list=[]), set(['media']))
- def test_skipped_file_search_paths(self):
+ def test_expectations_files(self):
port = TestWebKitPort()
- self.assertEqual(port._skipped_file_search_paths(), set(['testwebkitport']))
+
+ def platform_dirs(port):
+ return [port.host.filesystem.basename(port.host.filesystem.dirname(f)) for f in port.expectations_files()]
+
+ self.assertEqual(platform_dirs(port), ['testwebkitport'])
+
port._name = "testwebkitport-version"
- self.assertEqual(port._skipped_file_search_paths(), set(['testwebkitport', 'testwebkitport-version']))
+ self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version'])
+
port._options = MockOptions(webkit_test_runner=True)
- self.assertEqual(port._skipped_file_search_paths(), set(['testwebkitport', 'testwebkitport-version', 'testwebkitport-wk2', 'wk2']))
+ self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version', 'testwebkitport-wk2', 'wk2'])
+
port._options = MockOptions(additional_platform_directory=["internal-testwebkitport"])
- self.assertEqual(port._skipped_file_search_paths(), set(['testwebkitport', 'testwebkitport-version', 'internal-testwebkitport']))
+ self.assertEqual(platform_dirs(port), ['testwebkitport', 'testwebkitport-version', 'internal-testwebkitport'])
def test_root_option(self):
port = TestWebKitPort()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (132409 => 132410)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-10-24 22:01:03 UTC (rev 132409)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-10-24 22:04:00 UTC (rev 132410)
@@ -62,7 +62,7 @@
def __init__(self, host, port_name, **kwargs):
super(QtPort, self).__init__(host, port_name, **kwargs)
- # FIXME: This will allow Port.baseline_search_path and Port._skipped_file_search_paths
+ # FIXME: This will allow Port.baseline_search_path
# to do the right thing, but doesn't include support for qt-4.8 or qt-arm (seen in LayoutTests/platform) yet.
self._operating_system = port_name.replace('qt-', '')
@@ -115,8 +115,6 @@
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
