Windows test results should not fall back to mac-mountainlion after r180176
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Feb 2015 22:31:28 +0000 (22:31 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Feb 2015 22:31:28 +0000 (22:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=141719

Reviewed by Brent Fulgham.

* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
(_should_file_trigger_build):
* Scripts/webkitpy/port/win.py:
(WinPort.default_baseline_search_path):
* Scripts/webkitpy/port/win_unittest.py:
(WinPortTest.test_baseline_search_path):

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

Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py
Tools/ChangeLog
Tools/Scripts/webkitpy/port/win.py
Tools/Scripts/webkitpy/port/win_unittest.py

index 3f7cb863a8b3f84b40d4308acdbaba466a7757d1..922e32d05d403ea778a91c9ca0db331cd5c37767 100644 (file)
@@ -37,7 +37,7 @@ def _should_file_trigger_build(target_platform, file):
     # and start using it for their bots. Someone familiar with each platform
     # will have to figure out what the right set of directories/patterns is for
     # that platform.
-    assert(target_platform in ("mac-mavericks", "mac-mountainlion", "mac-yosemite", "win"))
+    assert(target_platform in ("mac-mavericks", "mac-yosemite", "win"))
 
     directories = [
         # Directories that shouldn't trigger builds on any bots.
index 7e48db250411999f7eb5fc3d8a05b10f268ab6bf..d2d9c6530ee0c81b286938c8135ee3f395947249 100644 (file)
@@ -1,3 +1,17 @@
+2015-02-17  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Windows test results should not fall back to mac-mountainlion after r180176
+        https://bugs.webkit.org/show_bug.cgi?id=141719
+
+        Reviewed by Brent Fulgham.
+
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+        (_should_file_trigger_build):
+        * Scripts/webkitpy/port/win.py:
+        (WinPort.default_baseline_search_path):
+        * Scripts/webkitpy/port/win_unittest.py:
+        (WinPortTest.test_baseline_search_path):
+
 2015-02-17  Daniel Bates  <dabates@apple.com>
 
         [iOS] run-webkit-tests should check that simctl can boot and shutdown simulator device before running tests
index 3fadd66379f859249fb25e1aaea7d8bcda673c97..f84e9c9890f374ea9fade7e217d073a26fdc770d 100644 (file)
@@ -87,7 +87,7 @@ class WinPort(ApplePort):
             fallback_names.append('mac-wk2')
             # Note we do not add 'wk2' here, even though it's included in _skipped_search_paths().
         # FIXME: Perhaps we should get this list from MacPort?
-        fallback_names.extend(['mac-mountainlion', 'mac'])
+        fallback_names.append('mac')
         return map(self._webkit_baseline_path, fallback_names)
 
     def operating_system(self):
index 102446120f12ebbf0870ed25e1b5a1065bab201a..1ef187addb435d69955f059fa054a195a784e244 100644 (file)
@@ -63,13 +63,13 @@ class WinPortTest(port_testcase.PortTestCase):
         self.assertEqual(port.baseline_search_path(), absolute_search_paths)
 
     def test_baseline_search_path(self):
-        self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-mountainlion', 'mac'], 'xp')
-        self._assert_search_path(['win-vista', 'win-7sp0', 'win', 'mac-mountainlion', 'mac'], 'vista')
-        self._assert_search_path(['win-7sp0', 'win', 'mac-mountainlion', 'mac'], '7sp0')
+        self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win', 'mac'], 'xp')
+        self._assert_search_path(['win-vista', 'win-7sp0', 'win', 'mac'], 'vista')
+        self._assert_search_path(['win-7sp0', 'win', 'mac'], '7sp0')
 
-        self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac-mountainlion', 'mac'], 'xp', use_webkit2=True)
-        self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac-mountainlion', 'mac'], 'vista', use_webkit2=True)
-        self._assert_search_path(['win-wk2', 'win-7sp0', 'win', 'mac-wk2', 'mac-mountainlion', 'mac'], '7sp0', use_webkit2=True)
+        self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
+        self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
+        self._assert_search_path(['win-wk2', 'win-7sp0', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
 
     def _assert_version(self, port_name, expected_version):
         host = MockSystemHost(os_name='win', os_version=expected_version)