Title: [127174] trunk/Tools
- Revision
- 127174
- Author
- [email protected]
- Date
- 2012-08-30 13:01:23 -0700 (Thu, 30 Aug 2012)
Log Message
NRWT should look in mac-wk2 for a TestExpecations file
https://bugs.webkit.org/show_bug.cgi?id=95370
Reviewed by Ojan Vafai.
Adds support for mac-wk2 and win-wk2 to expectations_files()
for the apple mac and apple win ports.
* Scripts/webkitpy/layout_tests/port/apple.py:
(ApplePort.expectations_files):
* Scripts/webkitpy/layout_tests/port/mac_unittest.py:
(MacTest.test_expectations_files):
* Scripts/webkitpy/layout_tests/port/win_unittest.py:
(WinTest.test_expectations_files):
* Scripts/webkitpy/layout_tests/port/port_testcase.py:
(PortTestCase.test_expectations_files):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (127173 => 127174)
--- trunk/Tools/ChangeLog 2012-08-30 19:58:08 UTC (rev 127173)
+++ trunk/Tools/ChangeLog 2012-08-30 20:01:23 UTC (rev 127174)
@@ -1,3 +1,22 @@
+2012-08-30 Dirk Pranke <[email protected]>
+
+ NRWT should look in mac-wk2 for a TestExpecations file
+ https://bugs.webkit.org/show_bug.cgi?id=95370
+
+ Reviewed by Ojan Vafai.
+
+ Adds support for mac-wk2 and win-wk2 to expectations_files()
+ for the apple mac and apple win ports.
+
+ * Scripts/webkitpy/layout_tests/port/apple.py:
+ (ApplePort.expectations_files):
+ * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+ (MacTest.test_expectations_files):
+ * Scripts/webkitpy/layout_tests/port/win_unittest.py:
+ (WinTest.test_expectations_files):
+ * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+ (PortTestCase.test_expectations_files):
+
2012-08-30 Jon Lee <[email protected]>
[Mac] Add testRunner.dumpWebNotificationCallbacks() to DRT
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py (127173 => 127174)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py 2012-08-30 19:58:08 UTC (rev 127173)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py 2012-08-30 20:01:23 UTC (rev 127174)
@@ -97,3 +97,9 @@
for architecture in self.ARCHITECTURES:
configurations.append(TestConfiguration(version=self._strip_port_name_prefix(port_name), architecture=architecture, build_type=build_type))
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
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py (127173 => 127174)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2012-08-30 19:58:08 UTC (rev 127173)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py 2012-08-30 20:01:23 UTC (rev 127174)
@@ -49,6 +49,10 @@
super(MacTest, self).test_default_timeout_ms()
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)
+
def test_skipped_file_search_paths(self):
# We should have two skipped files - platform+version and platform; however, we don't
# have platform+version for either the most recent version or mac-future.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py (127173 => 127174)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py 2012-08-30 19:58:08 UTC (rev 127173)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py 2012-08-30 20:01:23 UTC (rev 127174)
@@ -106,6 +106,9 @@
self.assertTrue('--foo=bar' in cmd_line)
self.assertTrue('--foo=baz' in cmd_line)
+ def test_expectations_files(self):
+ self.assertNotEquals(self.make_port().expectations_files(), [])
+
def test_uses_apache(self):
self.assertTrue(self.make_port()._uses_apache())
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py (127173 => 127174)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py 2012-08-30 19:58:08 UTC (rev 127173)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py 2012-08-30 20:01:23 UTC (rev 127174)
@@ -103,3 +103,7 @@
self.assertEquals(port._runtime_feature_list(), None)
port._executive.run_command = lambda command, cwd=None, error_handler=None: "SupportedFeatures:foo bar"
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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
