Title: [180681] trunk/Tools
- Revision
- 180681
- Author
- o...@webkit.org
- Date
- 2015-02-26 10:32:48 -0800 (Thu, 26 Feb 2015)
Log Message
[webkitpy] Remove skipped file related crufts
https://bugs.webkit.org/show_bug.cgi?id=142046
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/port/base.py:
(Port.skipped_layout_tests):
(Port._tests_from_skipped_file_contents): Deleted.
(Port): Deleted.
(Port._expectations_from_skipped_files): Deleted.
* Scripts/webkitpy/port/mac_unittest.py:
(MacTest.test_default_timeout_ms):
(MacTest): Deleted.
(test_tests_from_skipped_file_contents): Deleted.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (180680 => 180681)
--- trunk/Tools/ChangeLog 2015-02-26 18:19:41 UTC (rev 180680)
+++ trunk/Tools/ChangeLog 2015-02-26 18:32:48 UTC (rev 180681)
@@ -1,3 +1,20 @@
+2015-02-26 Csaba Osztrogonác <o...@webkit.org>
+
+ [webkitpy] Remove skipped file related crufts
+ https://bugs.webkit.org/show_bug.cgi?id=142046
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.skipped_layout_tests):
+ (Port._tests_from_skipped_file_contents): Deleted.
+ (Port): Deleted.
+ (Port._expectations_from_skipped_files): Deleted.
+ * Scripts/webkitpy/port/mac_unittest.py:
+ (MacTest.test_default_timeout_ms):
+ (MacTest): Deleted.
+ (test_tests_from_skipped_file_contents): Deleted.
+
2015-02-26 Brent Fulgham <bfulg...@apple.com>
[Win] Unreviewed WinCairo build fix after r180653.
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (180680 => 180681)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2015-02-26 18:19:41 UTC (rev 180680)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2015-02-26 18:32:48 UTC (rev 180681)
@@ -675,28 +675,6 @@
"""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 = []
- for line in skipped_file_contents.split('\n'):
- line = line.strip()
- line = line.rstrip('/') # Best to normalize directory names to not include the trailing slash.
- if line.startswith('#') or not len(line):
- continue
- tests_to_skip.append(line)
- return tests_to_skip
-
- def _expectations_from_skipped_files(self, skipped_file_paths):
- tests_to_skip = []
- for search_path in skipped_file_paths:
- filename = self._filesystem.join(self._webkit_baseline_path(search_path), "Skipped")
- if not self._filesystem.exists(filename):
- _log.debug("Skipped does not exist: %s" % filename)
- continue
- _log.debug("Using Skipped file: %s" % filename)
- skipped_file_contents = self._filesystem.read_text_file(filename)
- tests_to_skip.extend(self._tests_from_skipped_file_contents(skipped_file_contents))
- return tests_to_skip
-
@memoized
def skipped_perf_tests(self):
filename = self._filesystem.join(self.perf_tests_dir(), "Skipped")
Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (180680 => 180681)
--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2015-02-26 18:19:41 UTC (rev 180680)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2015-02-26 18:32:48 UTC (rev 180681)
@@ -49,31 +49,6 @@
super(MacTest, self).test_default_timeout_ms()
self.assertEqual(self.make_port(options=MockOptions(guard_malloc=True)).default_timeout_ms(), 350000)
-
- 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
-
-# <rdar://problem/5643675> window.scrollTo scrolls a window with no scrollbars
-fast/events/attempt-scroll-with-no-scrollbars.html
-
-# see bug <rdar://problem/5646437> REGRESSION (r28015): svg/batik/text/smallFonts fails
-svg/batik/text/smallFonts.svg
-
-# Java tests don't work on WK2
-java/
-"""
- example_skipped_tests = [
- "fast/events/mouseout-on-window.html",
- "fast/events/attempt-scroll-with-no-scrollbars.html",
- "svg/batik/text/smallFonts.svg",
- "java",
- ]
-
- def test_tests_from_skipped_file_contents(self):
- port = self.make_port()
- self.assertEqual(port._tests_from_skipped_file_contents(self.example_skipped_file), self.example_skipped_tests)
-
def assert_name(self, port_name, os_version_string, expected):
host = MockSystemHost(os_name='mac', os_version=os_version_string)
port = self.make_port(host=host, port_name=port_name)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
