Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py (183640 => 183641)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2015-04-30 19:51:56 UTC (rev 183640)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2015-04-30 20:01:18 UTC (rev 183641)
@@ -47,30 +47,28 @@
("Tools/BuildSlaveSupport/build.webkit.org-config/public_html", []),
("Websites", []),
("efl", []),
- ("iphone", []),
+ ("ios", []),
("opengl", []),
("opentype", []),
("openvg", []),
("wx", []),
# Directories that should trigger builds on only some bots.
+ ("LayoutTests/platform/mac-mavericks", ["mac-mavericks"]),
+ ("LayoutTests/platform/mac-yosemite", ["mac-mavericks", "mac-yosemite"]),
+ ("LayoutTests/platform/mac-wk2", ["mac-mavericks", "mac-yosemite"]),
+ ("LayoutTests/platform/mac-wk1", ["mac-mavericks", "mac-yosemite"]),
("LayoutTests/platform/mac", ["mac", "win"]),
+ ("LayoutTests/platform/wk2", ["mac"]),
("cairo", ["gtk", "wincairo"]),
- ("cf", ["mac", "qt", "win"]),
+ ("cf", ["mac", "win"]),
("cocoa", ["mac"]),
("curl", ["gtk", "wincairo"]),
("gobject", ["gtk"]),
- ("gpu", ["mac"]),
("gstreamer", ["gtk"]),
("gtk", ["gtk"]),
("mac", ["mac"]),
- ("mac-leopard", ["mac-leopard"]),
- ("mac-lion", ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
- ("mac-mountainlion", ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard", "win"]),
- ("mac-snowleopard", ["mac-leopard", "mac-snowleopard"]),
- ("mac-wk2", ["mac-lion", "mac-snowleopard", "mac-mavericks", "mac-mountainlion", "win"]),
("objc", ["mac"]),
- ("qt", ["qt"]),
("soup", ["gtk"]),
("win", ["win"]),
]
@@ -91,7 +89,6 @@
(r"\.(?:vcproj|vsprops|sln|vcxproj|props|filters)$", ["win"]),
(r"\.exp(?:\.in)?$", ["mac"]),
(r"\.order$", ["mac"]),
- (r"\.pr[io]$", ["qt"]),
(r"\.(?:vcproj|vcxproj)/", ["win"]),
(r"\.xcconfig$", ["mac"]),
(r"\.xcodeproj/", ["mac"]),
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (183640 => 183641)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2015-04-30 19:51:56 UTC (rev 183640)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py 2015-04-30 20:01:18 UTC (rev 183641)
@@ -27,28 +27,29 @@
class ShouldBuildTest(unittest.TestCase):
_should_build_tests = [
(["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit2/ChangeLog-2011-02-11"], []),
- (["GNUmakefile.am", "Source/WebCore/GNUmakefile.am"], ["gtk"]),
(["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
(["Websites/bugs.webkit.org/foo"], []),
- (["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard"]),
+ (["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-mavericks", "mac-yosemite"]),
(["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"], ["*"]),
(["LayoutTests/canvas/philip/tests/size.attributes.parse.exp-expected.txt", "LayoutTests/canvas/philip/tests/size.attributes.parse.exp.html"], ["*"]),
- (["LayoutTests/platform/mac-leopard/foo"], ["mac-leopard"]),
- (["LayoutTests/platform/mac-lion/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
- (["LayoutTests/platform/mac-snowleopard/foo"], ["mac-leopard", "mac-snowleopard"]),
- (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-lion", "mac-mountainlion", "mac-snowleopard", "win"]),
- (["LayoutTests/platform/mac/foo"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard", "win"]),
+ (["LayoutTests/platform/mac-mavericks/foo"], ["mac-mavericks"]),
+ (["LayoutTests/platform/mac-yosemite/foo"], ["mac-mavericks", "mac-yosemite"]),
+ (["LayoutTests/platform/wk2/Skipped"], ["mac-mavericks", "mac-yosemite"]),
+ (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-mavericks", "mac-yosemite"]),
+ (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-mavericks", "mac-yosemite"]),
+ (["LayoutTests/platform/mac/foo"], ["mac-mavericks", "mac-yosemite", "win"]),
+ (["LayoutTests/platform/mac-wk2/platform/mac/editing/spelling/autocorrection-contraction-expected.txt"], ["mac-mavericks", "mac-yosemite"]),
(["LayoutTests/platform/win-xp/foo"], ["win"]),
- (["LayoutTests/platform/win-wk2/foo"], ["win"]),
+ (["LayoutTests/platform/win-wk1/foo"], ["win"]),
(["LayoutTests/platform/win/foo"], ["win"]),
- (["Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard"]),
- (["Source/WebCore/mac/foo"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard"]),
+ (["Source/WebKit/mac/WebKit.mac.exp"], ["mac-mavericks", "mac-yosemite"]),
+ (["Source/WebCore/mac/foo"], ["mac-mavericks", "mac-yosemite"]),
(["Source/WebCore/win/foo"], ["win"]),
- (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard"]),
(["Source/WebCore/platform/wx/wxcode/win/foo"], []),
- (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-lion", "mac-mountainlion", "mac-snowleopard"]),
+ (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], []),
+ (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-mavericks", "mac-yosemite"]),
(["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
]
@@ -56,7 +57,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-leopard", "mac-lion", "mac-mavericks", "mac-mountainlion", "mac-snowleopard", "win"]:
+ for platform in ["mac-mavericks", "mac-yosemite", "win"]:
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)))
