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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 602cef1..50909ef 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,23 @@
+2012-06-26  Dirk Pranke  <dpranke@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  <ossy@webkit.org>
 
         master.cfg cleanup: Pass CheckOutSource instance instead of class to BuildStep.addStep

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
index 01cdbce..ff58842 100755 (executable)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
@@ -65,7 +65,8 @@ class ChromiumWinPort(chromium.ChromiumPort):
     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

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
index f5d9e4d..ac23581 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py
@@ -82,9 +82,11 @@ class ChromiumWinTest(port_testcase.PortTestCase):
         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')