Diff
Modified: trunk/LayoutTests/ChangeLog (127189 => 127190)
--- trunk/LayoutTests/ChangeLog 2012-08-30 21:11:21 UTC (rev 127189)
+++ trunk/LayoutTests/ChangeLog 2012-08-30 21:17:20 UTC (rev 127190)
@@ -24,6 +24,20 @@
2012-08-30 Dirk Pranke <[email protected]>
+ Add more TestExpectations stubs for apple ports
+ https://bugs.webkit.org/show_bug.cgi?id=95495
+
+ Reviewed by Ojan Vafai.
+
+ This adds empty placeholder files so new-run-webkit-tests
+ doesn't get upset if they're missing.
+
+ * platform/mac-snowleopard/TestExpectations: Added.
+ * platform/win-xp/TestExpectations: Added.
+ * platform/wk2/TestExpectations: Added.
+
+2012-08-30 Dirk Pranke <[email protected]>
+
Add TestExpectations stubs for apple wk2 ports
Unreviewed, build fix.
Added: trunk/LayoutTests/platform/mac-snowleopard/TestExpectations (0 => 127190)
--- trunk/LayoutTests/platform/mac-snowleopard/TestExpectations (rev 0)
+++ trunk/LayoutTests/platform/mac-snowleopard/TestExpectations 2012-08-30 21:17:20 UTC (rev 127190)
@@ -0,0 +1,2 @@
+// This file should contain entries for expectations that are specific
+// to the Apple Mac port running on Snow Leopard.
Added: trunk/LayoutTests/platform/win-xp/TestExpectations (0 => 127190)
--- trunk/LayoutTests/platform/win-xp/TestExpectations (rev 0)
+++ trunk/LayoutTests/platform/win-xp/TestExpectations 2012-08-30 21:17:20 UTC (rev 127190)
@@ -0,0 +1,2 @@
+// This file should contain entries for expectations that are specific
+// to the Apple Windows port running on Windows XP.
Added: trunk/LayoutTests/platform/wk2/TestExpectations (0 => 127190)
--- trunk/LayoutTests/platform/wk2/TestExpectations (rev 0)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2012-08-30 21:17:20 UTC (rev 127190)
@@ -0,0 +1,2 @@
+// This file should contain entries for expectations that are generic
+// to any port running the WebKit2 variant (--webkit-test-runner)
Modified: trunk/Tools/ChangeLog (127189 => 127190)
--- trunk/Tools/ChangeLog 2012-08-30 21:11:21 UTC (rev 127189)
+++ trunk/Tools/ChangeLog 2012-08-30 21:17:20 UTC (rev 127190)
@@ -1,5 +1,27 @@
2012-08-30 Dirk Pranke <[email protected]>
+ nrwt should have TestExpectations everywhere we have Skipped files for apple ports
+ https://bugs.webkit.org/show_bug.cgi?id=95495
+
+ Reviewed by Ojan Vafai.
+
+ This is a follow-on to bug 95370 that adds in support for
+ platform/wk2/TestExpectations and
+ platform/{mac,win}-$version/TestExpectations.
+
+ * Scripts/webkitpy/layout_tests/port/apple.py:
+ (ApplePort.expectations_files):
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port._skipped_file_search_paths):
+ * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+ (MacTest.test_expectations_files):
+ * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
+ (MockDRTPortTest.make_port):
+ * Scripts/webkitpy/layout_tests/port/win_unittest.py:
+ (WinPortTest.test_expectations_files):
+
+2012-08-30 Dirk Pranke <[email protected]>
+
executive.run_in_parallel() hangs if given nothing to do
https://bugs.webkit.org/show_bug.cgi?id=95387
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py (127189 => 127190)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py 2012-08-30 21:11:21 UTC (rev 127189)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py 2012-08-30 21:17:20 UTC (rev 127190)
@@ -99,7 +99,4 @@
return configurations
def expectations_files(self):
- files = [self.path_to_test_expectations_file()]
- if self.get_option('webkit_test_runner'):
- files.append(self._filesystem.join(self._webkit_baseline_path(self.port_name + '-wk2'), 'TestExpectations'))
- return files
+ 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 (127189 => 127190)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-30 21:11:21 UTC (rev 127189)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-30 21:17:20 UTC (rev 127190)
@@ -1466,7 +1466,9 @@
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.
+ # 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():
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py (127189 => 127190)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2012-08-30 21:11:21 UTC (rev 127189)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2012-08-30 21:17:20 UTC (rev 127190)
@@ -50,8 +50,8 @@
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()), 1)
- self.assertEquals(len(self.make_port(options=MockOptions(webkit_test_runner=True)).expectations_files()), 2)
+ 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
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py (127189 => 127190)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py 2012-08-30 21:11:21 UTC (rev 127189)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py 2012-08-30 21:17:20 UTC (rev 127190)
@@ -49,7 +49,7 @@
def make_port(self, options=mock_options):
host = MockSystemHost()
test.add_unit_tests_to_mock_filesystem(host.filesystem)
- return mock_drt.MockDRTPort(host, port_name='mock-mac', options=options)
+ return mock_drt.MockDRTPort(host, port_name='mock-mac-lion', options=options)
def test_port_name_in_constructor(self):
self.assertTrue(mock_drt.MockDRTPort(MockSystemHost(), port_name='mock-test'))
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py (127189 => 127190)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py 2012-08-30 21:11:21 UTC (rev 127189)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py 2012-08-30 21:17:20 UTC (rev 127190)
@@ -105,5 +105,5 @@
self.assertEquals(port._runtime_feature_list(), ['foo', 'bar'])
def test_expectations_files(self):
- self.assertEquals(len(self.make_port().expectations_files()), 1)
- self.assertEquals(len(self.make_port(options=MockOptions(webkit_test_runner=True)).expectations_files()), 2)
+ self.assertEquals(len(self.make_port().expectations_files()), 2)
+ self.assertEquals(len(self.make_port(options=MockOptions(webkit_test_runner=True)).expectations_files()), 4)
