Title: [121266] trunk/Tools
- Revision
- 121266
- Author
- dpra...@chromium.org
- Date
- 2012-06-26 10:01:21 -0700 (Tue, 26 Jun 2012)
Log Message
nrwt: broken for chromium on vista
https://bugs.webkit.org/show_bug.cgi?id=89988
Reviewed by Tony Chang.
r121194 removed support for 'chromium-win-vista' as a separate
port, but this actually prevented the code from running on vista
at all, which is unduly harsh and broke the websocket tests on
the (non-webkit) chromium bots that are still running on vista.
It's probably good enough to pretend that vista is win7 instead;
some layout tests will still fail but at least things'll run.
* Scripts/webkitpy/layout_tests/port/chromium_win.py:
(ChromiumWinPort.determine_full_port_name):
* Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
(ChromiumWinTest.test_versions):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121265 => 121266)
--- trunk/Tools/ChangeLog 2012-06-26 16:30:49 UTC (rev 121265)
+++ trunk/Tools/ChangeLog 2012-06-26 17:01:21 UTC (rev 121266)
@@ -1,3 +1,23 @@
+2012-06-26 Dirk Pranke <dpra...@chromium.org>
+
+ nrwt: broken for chromium on vista
+ https://bugs.webkit.org/show_bug.cgi?id=89988
+
+ Reviewed by Tony Chang.
+
+ r121194 removed support for 'chromium-win-vista' as a separate
+ port, but this actually prevented the code from running on vista
+ at all, which is unduly harsh and broke the websocket tests on
+ the (non-webkit) chromium bots that are still running on vista.
+
+ It's probably good enough to pretend that vista is win7 instead;
+ some layout tests will still fail but at least things'll run.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+ (ChromiumWinPort.determine_full_port_name):
+ * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+ (ChromiumWinTest.test_versions):
+
2012-06-26 Csaba Osztrogonác <o...@webkit.org>
master.cfg cleanup: Pass CheckOutSource instance instead of class to BuildStep.addStep
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (121265 => 121266)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2012-06-26 16:30:49 UTC (rev 121265)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2012-06-26 17:01:21 UTC (rev 121266)
@@ -65,7 +65,8 @@
def determine_full_port_name(cls, host, options, port_name):
if port_name.endswith('-win'):
assert host.platform.is_win()
- if host.platform.os_version in ('7sp0', '7sp1', 'future'):
+ # We don't maintain separate baselines for vista, so we pretend it is win7.
+ if host.platform.os_version in ('vista', '7sp0', '7sp1', 'future'):
version = 'win7'
else:
version = host.platform.os_version
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (121265 => 121266)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2012-06-26 16:30:49 UTC (rev 121265)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2012-06-26 17:01:21 UTC (rev 121266)
@@ -82,9 +82,11 @@
self.assert_name('chromium-win-xp', '7sp0', 'chromium-win-xp')
self.assert_name(None, '7sp0', 'chromium-win-win7')
+ self.assert_name(None, 'vista', 'chromium-win-win7')
self.assert_name('chromium-win', '7sp0', 'chromium-win-win7')
self.assert_name('chromium-win-win7', 'xp', 'chromium-win-win7')
self.assert_name('chromium-win-win7', '7sp0', 'chromium-win-win7')
+ self.assert_name('chromium-win-win7', 'vista', 'chromium-win-win7')
self.assertRaises(AssertionError, self.assert_name, None, 'w2k', 'chromium-win-xp')
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
