Title: [119747] trunk/Tools
- Revision
- 119747
- Author
- [email protected]
- Date
- 2012-06-07 12:44:59 -0700 (Thu, 07 Jun 2012)
Log Message
run-webkit-tests --lint-test-files gives an error when run on linux
https://bugs.webkit.org/show_bug.cgi?id=88551
Reviewed by Ojan Vafai.
We weren't mapping the expectations properly for the
google-chrome ports.
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.path_to_test_expectations_file):
* Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
(TestGoogleChromePort.test_path_to_expectations):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (119746 => 119747)
--- trunk/Tools/ChangeLog 2012-06-07 19:27:40 UTC (rev 119746)
+++ trunk/Tools/ChangeLog 2012-06-07 19:44:59 UTC (rev 119747)
@@ -1,3 +1,18 @@
+2012-06-07 Dirk Pranke <[email protected]>
+
+ run-webkit-tests --lint-test-files gives an error when run on linux
+ https://bugs.webkit.org/show_bug.cgi?id=88551
+
+ Reviewed by Ojan Vafai.
+
+ We weren't mapping the expectations properly for the
+ google-chrome ports.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port.path_to_test_expectations_file):
+ * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
+ (TestGoogleChromePort.test_path_to_expectations):
+
2012-06-07 Daniel Erat <[email protected]>
[chromium] Add LayoutTestController::setTextSubpixelPositioning() for Linux.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (119746 => 119747)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-06-07 19:27:40 UTC (rev 119746)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-06-07 19:44:59 UTC (rev 119747)
@@ -691,7 +691,7 @@
# test_expectations are always in mac/ not mac-leopard/ by convention, hence we use port_name instead of name().
port_name = self.port_name
- if port_name.startswith('chromium'):
+ if port_name.startswith('chromium') or port_name.startswith('google-chrome'):
port_name = 'chromium'
baseline_path = self._webkit_baseline_path(port_name)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py (119746 => 119747)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py 2012-06-07 19:27:40 UTC (rev 119746)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py 2012-06-07 19:44:59 UTC (rev 119747)
@@ -67,6 +67,11 @@
self._verify_expectations_overrides('google-chrome-linux32')
self._verify_expectations_overrides('google-chrome-linux64')
+ def test_path_to_expectations(self):
+ port_factory = PortFactory(MockSystemHost())
+ for port_name in ('google-chrome-linux32', 'google-chrome-linux64', 'google-chrome-mac', 'google-chrome-win'):
+ self.assertTrue(port_factory.get(port_name).path_to_test_expectations_file().endswith('platform/chromium/TestExpectations'))
+
if __name__ == '__main__':
unittest.main()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
