Title: [90201] trunk/Tools
- Revision
- 90201
- Author
- [email protected]
- Date
- 2011-06-30 20:31:51 -0700 (Thu, 30 Jun 2011)
Log Message
2011-06-30 Eric Seidel <[email protected]>
Reviewed by Adam Barth.
Update new-run-webkit-tests now that the wk2 shared skipped list has moved
https://bugs.webkit.org/show_bug.cgi?id=63780
The shared list was moved from mac-wk2 to wk2 as part of
http://trac.webkit.org/changeset/90125.
* Scripts/webkitpy/layout_tests/port/webkit.py:
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90200 => 90201)
--- trunk/Tools/ChangeLog 2011-07-01 03:28:38 UTC (rev 90200)
+++ trunk/Tools/ChangeLog 2011-07-01 03:31:51 UTC (rev 90201)
@@ -1,3 +1,16 @@
+2011-06-30 Eric Seidel <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ Update new-run-webkit-tests now that the wk2 shared skipped list has moved
+ https://bugs.webkit.org/show_bug.cgi?id=63780
+
+ The shared list was moved from mac-wk2 to wk2 as part of
+ http://trac.webkit.org/changeset/90125.
+
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+ * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+
2011-06-30 Kenichi Ishibashi <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (90200 => 90201)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-07-01 03:28:38 UTC (rev 90200)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-07-01 03:31:51 UTC (rev 90201)
@@ -288,11 +288,9 @@
# Note order doesn't matter since the Skipped file contents are all combined.
search_paths = set([self.port_name, self.name()])
if self.get_option('webkit_test_runner'):
- # Quoting old-run-webkit-tests:
- # Because nearly all of the skipped tests for WebKit 2 on Mac are due to
- # cross-platform issues, the Windows and Qt ports use the Mac skipped list
- # additionally to their own to avoid maintaining separate lists.
- search_paths.update([self._wk2_port_name(), "mac-wk2"])
+ # 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"])
return search_paths
def _expectations_from_skipped_files(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (90200 => 90201)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-07-01 03:28:38 UTC (rev 90200)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-07-01 03:31:51 UTC (rev 90201)
@@ -97,7 +97,7 @@
port._name = "testwebkitport-version"
self.assertEqual(port._skipped_file_search_paths(), set(['testwebkitport', 'testwebkitport-version']))
port._options = MockOptions(webkit_test_runner=True)
- self.assertEqual(port._skipped_file_search_paths(), set(['testwebkitport', 'testwebkitport-version', 'testwebkitport-wk2', 'mac-wk2']))
+ self.assertEqual(port._skipped_file_search_paths(), set(['testwebkitport', 'testwebkitport-version', 'testwebkitport-wk2', 'wk2']))
def test_test_expectations(self):
# Check that we read both the expectations file and anything in a
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
