Title: [118429] trunk/Tools
- Revision
- 118429
- Author
- [email protected]
- Date
- 2012-05-24 15:21:47 -0700 (Thu, 24 May 2012)
Log Message
nrwt: fix baseline search path for official chrome builders
https://bugs.webkit.org/show_bug.cgi?id=87432
Reviewed by Tony Chang.
The official chrome builders need to use the win7 and SL
baseline paths, not the XP and Leopard paths. Linux is correct.
* Scripts/webkitpy/layout_tests/port/google_chrome.py:
(GoogleChromeMacPort.determine_full_port_name):
(GoogleChromeWinPort.determine_full_port_name):
* Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
(TestGoogleChromePort._verify_baseline_search_path_startswith):
(TestGoogleChromePort.test_get_google_chrome_port):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (118428 => 118429)
--- trunk/Tools/ChangeLog 2012-05-24 22:21:06 UTC (rev 118428)
+++ trunk/Tools/ChangeLog 2012-05-24 22:21:47 UTC (rev 118429)
@@ -1,3 +1,20 @@
+2012-05-24 Dirk Pranke <[email protected]>
+
+ nrwt: fix baseline search path for official chrome builders
+ https://bugs.webkit.org/show_bug.cgi?id=87432
+
+ Reviewed by Tony Chang.
+
+ The official chrome builders need to use the win7 and SL
+ baseline paths, not the XP and Leopard paths. Linux is correct.
+
+ * Scripts/webkitpy/layout_tests/port/google_chrome.py:
+ (GoogleChromeMacPort.determine_full_port_name):
+ (GoogleChromeWinPort.determine_full_port_name):
+ * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
+ (TestGoogleChromePort._verify_baseline_search_path_startswith):
+ (TestGoogleChromePort.test_get_google_chrome_port):
+
2012-05-24 Thiago Marcos P. Santos <[email protected]>
[NRWT] REGRESSION(r116021): Assertion when running with --no-http
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome.py (118428 => 118429)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome.py 2012-05-24 22:21:06 UTC (rev 118428)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome.py 2012-05-24 22:21:47 UTC (rev 118429)
@@ -92,7 +92,7 @@
# FIXME: Make google-chrome-XXX work as a port name.
@classmethod
def determine_full_port_name(cls, host, options, port_name):
- return 'chromium-mac-leopard'
+ return 'chromium-mac-snowleopard'
def baseline_search_path(self):
paths = chromium_mac.ChromiumMacPort.baseline_search_path(self)
@@ -109,7 +109,7 @@
# FIXME: Make google-chrome-XXX work as a port name.
@classmethod
def determine_full_port_name(cls, host, options, port_name):
- return 'chromium-win-xp'
+ return 'chromium-win-win7'
def baseline_search_path(self):
paths = chromium_win.ChromiumWinPort.baseline_search_path(self)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py (118428 => 118429)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py 2012-05-24 22:21:06 UTC (rev 118428)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py 2012-05-24 22:21:47 UTC (rev 118429)
@@ -31,10 +31,10 @@
class TestGoogleChromePort(unittest.TestCase):
- def _verify_baseline_path(self, expected_path, port_name):
+ def _verify_baseline_search_path_startswith(self, port_name, expected_platform_dirs):
port = PortFactory(MockSystemHost()).get(port_name=port_name)
- path = port.baseline_search_path()[0]
- self.assertEqual(expected_path, port._filesystem.basename(path))
+ actual_platform_dirs = [port._filesystem.basename(path) for path in port.baseline_search_path()]
+ self.assertEqual(expected_platform_dirs, actual_platform_dirs[0:len(expected_platform_dirs)])
def _verify_expectations_overrides(self, port_name):
host = MockSystemHost()
@@ -57,13 +57,13 @@
self.assertEqual(actual_chrome_overrides, expected_chromium_overrides + expected_chrome_overrides)
def test_get_google_chrome_port(self):
- self._verify_baseline_path('google-chrome-linux32', 'google-chrome-linux32')
- self._verify_baseline_path('google-chrome-linux64', 'google-chrome-linux64')
- self._verify_baseline_path('google-chrome-mac', 'google-chrome-mac-leopard')
- self._verify_baseline_path('google-chrome-win', 'google-chrome-win-xp')
+ self._verify_baseline_search_path_startswith('google-chrome-linux32', ['google-chrome-linux32', 'chromium-linux-x86'])
+ self._verify_baseline_search_path_startswith('google-chrome-linux64', ['google-chrome-linux64', 'chromium-linux'])
+ self._verify_baseline_search_path_startswith('google-chrome-mac', ['google-chrome-mac', 'chromium-mac-snowleopard'])
+ self._verify_baseline_search_path_startswith('google-chrome-win', ['google-chrome-win', 'chromium-win'])
- self._verify_expectations_overrides('google-chrome-mac-leopard')
- self._verify_expectations_overrides('google-chrome-win-xp')
+ self._verify_expectations_overrides('google-chrome-mac')
+ self._verify_expectations_overrides('google-chrome-win')
self._verify_expectations_overrides('google-chrome-linux32')
self._verify_expectations_overrides('google-chrome-linux64')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
