[webkit-changes] [217922] trunk

Wed, 07 Jun 2017 21:46:54 -0700

Title: [217922] trunk
Revision
217922
Author
[email protected]
Date
2017-06-07 21:46:34 -0700 (Wed, 07 Jun 2017)

Log Message

Add High Sierra support to WebKit tools
https://bugs.webkit.org/show_bug.cgi?id=173080

Rubber-stamped by Daniel Bates.

Tools:

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/HighSierra.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
Added dashboard support.

* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
Trigger the right build queues on check-in.

* Scripts/webkitpy/common/system/platforminfo.py:
* Scripts/webkitpy/common/system/platforminfo_unittest.py:
* Scripts/webkitpy/layout_tests/models/test_expectations.py:
* Scripts/webkitpy/port/mac.py:
* Scripts/webkitpy/port/mac_unittest.py:
* TestResultServer/static-dashboards/flakiness_dashboard.js:
Added cases for Sierra, and updated tests for new baseline search paths.

LayoutTests:

* platform/mac-sierra: Added an empty directory to avoid breaking scripts.

Modified Paths

Added Paths

Diff

Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/HighSierra.png


(Binary files differ)
Index: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/HighSierra.png =================================================================== --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/HighSierra.png 2017-06-08 04:43:51 UTC (rev 217921) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/HighSierra.png 2017-06-08 04:46:34 UTC (rev 217922) Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/HighSierra.png ___________________________________________________________________

Added: svn:mime-type

+image/png \ No newline at end of property

Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]


(Binary files differ)
Index: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] =================================================================== --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2017-06-08 04:43:51 UTC (rev 217921) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2017-06-08 04:46:34 UTC (rev 217922) Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] ___________________________________________________________________

Added: svn:mime-type

+image/png \ No newline at end of property

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (217921 => 217922)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	2017-06-08 04:46:34 UTC (rev 217922)
@@ -25,6 +25,7 @@
 
 Dashboard = {
     Platform: {
+        macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 7 },
         macOSSierra: { name: "macos-sierra", readableName: "macOS Sierra", order: 8 },
         MacOSXElCapitan: { name: "mac-os-x-elcapitan", readableName: "OS X El Capitan", order: 9 },
         iOS10Simulator: { name: "ios-simulator-10", readableName: "iOS 10 Simulator", order: 30 },

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css (217921 => 217922)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	2017-06-08 04:46:34 UTC (rev 217922)
@@ -188,6 +188,10 @@
     content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/Sierra.png) 1x);
 }
 
+table.queue-grid tr.platform.macos-highsierra img.logo {
+    content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/HighSierra.png) 1x);
+}
+
 table.queue-grid tr.platform.windows-8 img.logo {
     content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/Windows8.png) 1x);
 }

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py (217921 => 217922)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2017-06-08 04:46:34 UTC (rev 217922)
@@ -37,7 +37,7 @@
     # 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-yosemite", "mac-elcapitan", "mac-sierra", "win", "ios-10", "ios-simulator-10"))
+    assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-10", "ios-simulator-10"))
 
     directories = [
         # Directories that shouldn't trigger builds on any bots.
@@ -58,8 +58,9 @@
         ("LayoutTests/platform/mac-yosemite", ["mac-yosemite"]),
         ("LayoutTests/platform/mac-elcapitan", ["mac-yosemite", "mac-elcapitan"]),
         ("LayoutTests/platform/mac-sierra", ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
-        ("LayoutTests/platform/mac-wk2", ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
-        ("LayoutTests/platform/mac-wk1", ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
+        ("LayoutTests/platform/mac-highsierra", ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
+        ("LayoutTests/platform/mac-wk2", ["mac"]),
+        ("LayoutTests/platform/mac-wk1", ["mac"]),
         ("LayoutTests/platform/mac", ["mac", "win"]),
         ("LayoutTests/platform/wk2", ["mac", "ios"]),
         ("cairo", ["gtk", "wincairo"]),

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (217921 => 217922)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2017-06-08 04:46:34 UTC (rev 217922)
@@ -29,8 +29,8 @@
         (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit2/ChangeLog-2011-02-11"], []),
         (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
         (["Websites/bugs.webkit.org/foo"], []),
-        (["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
-        (["Source/_javascript_Core/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
+        (["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
+        (["Source/_javascript_Core/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
         (["Source/_javascript_Core/_javascript_Core.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
         (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
         (["LayoutTests/foo"], ["*"]),
@@ -38,29 +38,30 @@
         (["LayoutTests/platform/mac-yosemite/foo"], ["mac-yosemite"]),
         (["LayoutTests/platform/mac-elcapitan/foo"], ["mac-yosemite", "mac-elcapitan"]),
         (["LayoutTests/platform/mac-sierra/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
+        (["LayoutTests/platform/mac-highsierra/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["LayoutTests/platform/ios-simulator/foo"], ["ios-10", "ios-simulator-10"]),
         (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-10", "ios-simulator-10"]),
         (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-10", "ios-simulator-10"]),
-        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
-        (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
-        (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
-        (["LayoutTests/platform/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "win"]),
-        (["LayoutTests/platform/mac-wk2/platform/mac/editing/spelling/autocorrection-contraction-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
+        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
+        (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
+        (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
+        (["LayoutTests/platform/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win"]),
+        (["LayoutTests/platform/mac-wk2/platform/mac/editing/spelling/autocorrection-contraction-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["LayoutTests/platform/win-xp/foo"], ["win"]),
         (["LayoutTests/platform/win-wk1/foo"], ["win"]),
         (["LayoutTests/platform/win/foo"], ["win"]),
-        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
-        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "win", "ios-10", "ios-simulator-10"]),
-        (["Source/WebKit/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
+        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
+        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-10", "ios-simulator-10"]),
+        (["Source/WebKit/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["Source/WebKit/ios/WebKit.iOS.exp"], ["ios-10", "ios-simulator-10"]),
-        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
+        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
         (["Source/WebCore/ios/foo"], ["ios-10", "ios-simulator-10"]),
-        (["Source/WebCore/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
+        (["Source/WebCore/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["Source/WebCore/win/foo"], ["win"]),
-        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
+        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
         (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-10", "ios-simulator-10"]),
-        (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
+        (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-10", "ios-simulator-10"]),
         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
     ]
@@ -69,7 +70,7 @@
         for files, platforms in self._should_build_tests:
             # FIXME: We should test more platforms here once
             # wkbuild._should_file_trigger_build is implemented for them.
-            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "win", "ios-10", "ios-simulator-10"]:
+            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-10", "ios-simulator-10"]:
                 should_build = platform in platforms or "*" in platforms
                 self.assertEqual(wkbuild.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))

Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (217921 => 217922)


--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py	2017-06-08 04:46:34 UTC (rev 217922)
@@ -169,6 +169,7 @@
             10: 'yosemite',
             11: 'elcapitan',
             12: 'sierra',
+            13: 'highsierra',
         }
         assert release_version >= min(version_strings.keys())
         return version_strings.get(release_version, 'future')

Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py (217921 => 217922)


--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py	2017-06-08 04:46:34 UTC (rev 217922)
@@ -139,7 +139,8 @@
         self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.10.0')).os_version, 'yosemite')
         self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.11.0')).os_version, 'elcapitan')
         self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.12.0')).os_version, 'sierra')
-        self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.13.0')).os_version, 'future')
+        self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.13.0')).os_version, 'highsierra')
+        self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.14.0')).os_version, 'future')
 
         self.assertEqual(self.make_info(fake_sys('linux2')).os_version, 'lucid')

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (217921 => 217922)


--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py	2017-06-08 04:46:34 UTC (rev 217922)
@@ -209,7 +209,7 @@
 
     # FIXME: Update the original modifiers and remove this once the old syntax is gone.
     _configuration_tokens_list = [
-        'Mac', 'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite', 'ElCapitan', 'Sierra',
+        'Mac', 'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite', 'ElCapitan', 'Sierra', 'HighSierra',
         'Win', 'XP', 'Vista', 'Win7',
         'Linux',
         'Android',

Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (217921 => 217922)


--- trunk/Tools/Scripts/webkitpy/port/mac.py	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py	2017-06-08 04:46:34 UTC (rev 217922)
@@ -41,7 +41,7 @@
 class MacPort(DarwinPort):
     port_name = "mac"
 
-    VERSION_FALLBACK_ORDER = ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra']
+    VERSION_FALLBACK_ORDER = ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac-highsierra']
     SDK = 'macosx'
 
     ARCHITECTURES = ['x86_64', 'x86']
@@ -68,10 +68,10 @@
 
     def configuration_specifier_macros(self):
         return {
-            "sierra+": ["sierra", "future"],
-            "elcapitan+": ["elcapitan", "sierra", "future"],
-            "mavericks+": ["mavericks", "yosemite", "elcapitan", "sierra", "future"],
-            "yosemite+": ["yosemite", "elcapitan", "sierra", "future"],
+            "highsierra+": ["highsierra", "future"],
+            "sierra+": ["sierra", "highsierra", "future"],
+            "elcapitan+": ["elcapitan", "sierra", "highsierra", "future"],
+            "yosemite+": ["yosemite", "elcapitan", "sierra", "highsierra", "future"],
         }
 
     def setup_environ_for_server(self, server_name=None):

Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (217921 => 217922)


--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py	2017-06-08 04:46:34 UTC (rev 217922)
@@ -78,6 +78,9 @@
         self.assert_name('mac', 'sierra', 'mac-sierra')
         self.assert_name('mac-sierra', 'yosemite', 'mac-sierra')
         self.assert_name('mac-sierra', 'elcapitan', 'mac-sierra')
+        self.assert_name('mac', 'highsierra', 'mac-highsierra')
+        self.assert_name('mac-highsierra', 'elcapitan', 'mac-highsierra')
+        self.assert_name('mac-highsierra', 'sierra', 'mac-highsierra')
         self.assert_name('mac', 'future', 'mac-future')
         self.assert_name('mac-future', 'future', 'mac-future')
         self.assertRaises(AssertionError, self.assert_name, 'mac-tiger', 'leopard', 'mac-leopard')
@@ -97,21 +100,23 @@
 
     def test_baseline_search_path(self):
         # Note that we don't need total coverage here, just path coverage, since this is all data driven.
-        self._assert_search_path('mac-snowleopard', 'mac-snowleopard', ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-wk1', 'mac'])
-        self._assert_search_path('mac-lion', 'mac-lion', ['mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-wk1', 'mac'])
-        self._assert_search_path('mac-mountainlion', 'mac-mountainlion', ['mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-wk1', 'mac'])
-        self._assert_search_path('mac-mavericks', 'mac-mavericks', ['mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-wk1', 'mac'])
-        self._assert_search_path('mac-yosemite', 'mac-yosemite', ['mac-yosemite', 'mac-elcapitan', 'mac-wk1', 'mac'])
-        self._assert_search_path('mac-elcapitan', 'mac-elcapitan', ['mac-elcapitan', 'mac-wk1', 'mac'])
-        self._assert_search_path('mac-sierra', 'mac-wk1', ['mac-wk1', 'mac'])
+        self._assert_search_path('mac-snowleopard', 'mac-snowleopard', ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac-wk1', 'mac'])
+        self._assert_search_path('mac-lion', 'mac-lion', ['mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac-wk1', 'mac'])
+        self._assert_search_path('mac-mountainlion', 'mac-mountainlion', ['mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac-wk1', 'mac'])
+        self._assert_search_path('mac-mavericks', 'mac-mavericks', ['mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac-wk1', 'mac'])
+        self._assert_search_path('mac-yosemite', 'mac-yosemite', ['mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac-wk1', 'mac'])
+        self._assert_search_path('mac-elcapitan', 'mac-elcapitan', ['mac-elcapitan', 'mac-sierra', 'mac-wk1', 'mac'])
+        self._assert_search_path('mac-sierra', 'mac-sierra', ['mac-sierra', 'mac-wk1', 'mac'])
+        self._assert_search_path('mac-highsierra', 'mac-wk1', ['mac-wk1', 'mac'])
         self._assert_search_path('mac-future', 'mac-wk1', ['mac-wk1', 'mac'])
-        self._assert_search_path('mac-snowleopard', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-lion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-mountainlion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-mavericks', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-yosemite', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-yosemite', 'mac-elcapitan', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-elcapitan', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-elcapitan', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-sierra', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-snowleopard', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-lion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-mountainlion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-mavericks', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mavericks', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-yosemite', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-yosemite', 'mac-elcapitan', 'mac-sierra', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-elcapitan', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-elcapitan', 'mac-sierra', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-sierra', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-sierra', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-highsierra', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
         self._assert_search_path('mac-future', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
 
     def test_show_results_html_file(self):

Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (217921 => 217922)


--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js	2017-06-08 04:43:51 UTC (rev 217921)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js	2017-06-08 04:46:34 UTC (rev 217922)
@@ -55,6 +55,12 @@
                             'WK2': { fallbackPlatforms: ['APPLE_MAC_SIERRA', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
                         }
                     },
+                    'HIGHSIERRA': {
+                        subPlatforms: {
+                            'WK1': { fallbackPlatforms: ['APPLE_MAC_HIGHSIERRA', 'APPLE_MAC'] },
+                            'WK2': { fallbackPlatforms: ['APPLE_MAC_HIGHSIERRA', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
+                        }
+                    },
                 }
             },
             'WIN': {
@@ -338,12 +344,14 @@
     if (string.contains(builderNameUpperCase, 'WIN XP'))
         return 'APPLE_WIN_XP';
 
+    if (string.contains(builderNameUpperCase, 'HIGHSIERRA'))
+        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_HIGHSIERRA');
     if (string.contains(builderNameUpperCase, 'SIERRA'))
-        return determineWKPlatform(builderNameUpperCase, 'SIERRA');
+        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_SIERRA');
     if (string.contains(builderNameUpperCase, 'EL CAPITAN'))
-        return determineWKPlatform(builderNameUpperCase, 'APPLE_ELCAPITAN');
+        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_ELCAPITAN');
     if (string.contains(builderNameUpperCase, 'MAVERICKS'))
-        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAVERICKS');
+        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_MAVERICKS');
     if (string.contains(builderNameUpperCase, 'LION'))
         return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_LION');
     if (string.contains(builderNameUpperCase, ' IOS ') && string.contains(builderNameUpperCase, 'SIMULATOR'))
@@ -687,6 +695,7 @@
             'Yosemite': 'YOSEMITE',
             'ElCapitan': 'ELCAPITAN',
             'Sierra': 'SIERRA',
+            'HighSierra': 'HIGHSIERRA',
             'Win7': 'WIN7',
             'XP': 'XP',
             'Vista': 'VISTA',

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to