Changeset 90201 in webkit

Timestamp:

Jun 30, 2011, 8:31:51 PM (15 years ago)

Author:

eric@webkit.org

Message:

2011-06-30 Eric Seidel <​eric@webkit.org>

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-30  Eric Seidel  <eric@webkit.org>
+
+        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  <bashi@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -289 +289 @@
         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
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py

@@ -98 +98 @@
         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):