Title: [104273] trunk/Tools
- Revision
- 104273
- Author
- o...@webkit.org
- Date
- 2012-01-06 00:14:02 -0800 (Fri, 06 Jan 2012)
Log Message
NRWT should use test_expectation.txt on wk2 platforms
https://bugs.webkit.org/show_bug.cgi?id=75417
Reviewed by Dirk Pranke.
* Scripts/webkitpy/layout_tests/port/webkit.py:
(path_to_test_expectations_file):
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
(test_path_to_test_expectations_file):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (104272 => 104273)
--- trunk/Tools/ChangeLog 2012-01-06 08:09:16 UTC (rev 104272)
+++ trunk/Tools/ChangeLog 2012-01-06 08:14:02 UTC (rev 104273)
@@ -1,3 +1,15 @@
+2012-01-06 Csaba Osztrogonác <o...@webkit.org>
+
+ NRWT should use test_expectation.txt on wk2 platforms
+ https://bugs.webkit.org/show_bug.cgi?id=75417
+
+ Reviewed by Dirk Pranke.
+
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+ (path_to_test_expectations_file):
+ * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+ (test_path_to_test_expectations_file):
+
2012-01-05 Jochen Eisinger <joc...@chromium.org>
Don't hardcode expected file URIs in as they depend on the platform
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (104272 => 104273)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2012-01-06 08:09:16 UTC (rev 104272)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2012-01-06 08:14:02 UTC (rev 104273)
@@ -78,8 +78,7 @@
def path_to_test_expectations_file(self):
# test_expectations are always in mac/ not mac-leopard/ by convention, hence we use port_name instead of name().
- expectations_directory = self._wk2_port_name() if self.get_option('webkit_test_runner') else self.port_name
- return self._filesystem.join(self._webkit_baseline_path(expectations_directory), 'test_expectations.txt')
+ return self._filesystem.join(self._webkit_baseline_path(self.port_name), 'test_expectations.txt')
def _port_flag_for_scripts(self):
# This is overrriden by ports which need a flag passed to scripts to distinguish the use of that port.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (104272 => 104273)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2012-01-06 08:09:16 UTC (rev 104272)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2012-01-06 08:14:02 UTC (rev 104273)
@@ -92,6 +92,13 @@
def test_baseline_search_path(self):
pass
+ def test_path_to_test_expectations_file(self):
+ port = TestWebKitPort()
+ port._options = MockOptions(webkit_test_runner=False)
+ self.assertEqual(port.path_to_test_expectations_file(), '/mock-checkout/LayoutTests/platform/testwebkitport/test_expectations.txt')
+ port._options = MockOptions(webkit_test_runner=True)
+ self.assertEqual(port.path_to_test_expectations_file(), '/mock-checkout/LayoutTests/platform/testwebkitport/test_expectations.txt')
+
def test_skipped_directories_for_symbols(self):
# This first test confirms that the commonly found symbols result in the expected skipped directories.
symbols_string = " ".join(["GraphicsLayer", "WebCoreHas3DRendering", "isXHTMLMPDocument", "fooSymbol"])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
