<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[180681] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/180681">180681</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-26 10:32:48 -0800 (Thu, 26 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmac_unittestpy">trunk/Tools/Scripts/webkitpy/port/mac_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180680 => 180681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-26 18:19:41 UTC (rev 180680)
+++ trunk/Tools/ChangeLog 2015-02-26 18:32:48 UTC (rev 180681)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-02-26 Csaba Osztrogonác <ossy@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.
+
</ins><span class="cx"> 2015-02-26 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed WinCairo build fix after r180653.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (180680 => 180681)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -675,28 +675,6 @@
</span><span class="cx"> """Returns tests skipped outside of the TestExpectations files."""
</span><span class="cx"> return set(self._tests_for_other_platforms()).union(self._skipped_tests_for_unsupported_features(test_list))
</span><span class="cx">
</span><del>- 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
-
</del><span class="cx"> @memoized
</span><span class="cx"> def skipped_perf_tests(self):
</span><span class="cx"> filename = self._filesystem.join(self.perf_tests_dir(), "Skipped")
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmac_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (180680 => 180681)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -49,31 +49,6 @@
</span><span class="cx"> super(MacTest, self).test_default_timeout_ms()
</span><span class="cx"> self.assertEqual(self.make_port(options=MockOptions(guard_malloc=True)).default_timeout_ms(), 350000)
</span><span class="cx">
</span><del>-
- 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)
-
</del><span class="cx"> def assert_name(self, port_name, os_version_string, expected):
</span><span class="cx"> host = MockSystemHost(os_name='mac', os_version=os_version_string)
</span><span class="cx"> port = self.make_port(host=host, port_name=port_name)
</span></span></pre>
</div>
</div>
</body>
</html>