Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (92159 => 92160)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2011-08-02 00:59:31 UTC (rev 92159)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2011-08-02 01:16:43 UTC (rev 92160)
@@ -2,27 +2,26 @@
"slaves": [ { "name": "test-slave", "platform": "*" },
{ "name": "apple-xserve-1", "platform": "mac-leopard" },
- { "name": "apple-xserve-2", "platform": "mac-leopard" },
- { "name": "apple-xserve-3", "platform": "mac-leopard" },
-
+ { "name": "apple-macpro-7", "platform": "mac-leopard" },
+
{ "name": "apple-xserve-4", "platform": "mac-snowleopard" },
{ "name": "apple-xserve-5", "platform": "mac-snowleopard" },
{ "name": "apple-xserve-6", "platform": "mac-snowleopard" },
{ "name": "apple-xserve-7", "platform": "mac-snowleopard" },
{ "name": "apple-xserve-8", "platform": "mac-snowleopard" },
{ "name": "apple-xserve-9", "platform": "mac-snowleopard" },
-
- { "name": "apple-pixel-1", "platform": "mac-leopard" },
-
{ "name": "apple-macpro-1", "platform": "mac-snowleopard" },
{ "name": "apple-macpro-2", "platform": "mac-snowleopard" },
{ "name": "apple-macpro-3", "platform": "mac-snowleopard" },
- { "name": "apple-macpro-4", "platform": "mac-leopard" },
- { "name": "apple-macpro-5", "platform": "mac-leopard" },
- { "name": "apple-macpro-6", "platform": "mac-leopard" },
- { "name": "apple-macpro-7", "platform": "mac-leopard" },
-
+ { "name": "apple-macpro-4", "platform": "mac-lion" },
+ { "name": "apple-macpro-5", "platform": "mac-lion" },
+ { "name": "apple-macpro-6", "platform": "mac-lion" },
+ { "name": "apple-macpro-8", "platform": "mac-lion" },
+ { "name": "apple-xserve-2", "platform": "mac-lion" },
+ { "name": "apple-xserve-3", "platform": "mac-lion" },
+ { "name": "apple-xserve-10", "platform": "mac-lion" },
+
{ "name": "apple-windows-1", "platform": "win"},
{ "name": "apple-windows-2", "platform": "win"},
{ "name": "apple-windows-3", "platform": "win"},
@@ -72,24 +71,14 @@
{ "name": "hfreyther-mipsel-linux1", "platform": "qt"}
],
- "builders": [ { "name": "Leopard Intel Release (Build)", "type": "Build", "builddir": "leopard-intel-release",
- "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"],
- "triggers": ["leopard-intel-release-tests"],
- "slavenames": ["apple-xserve-1", "apple-xserve-2", "test-slave"]
- },
- { "name": "Leopard Intel Release (Tests)", "type": "Test", "builddir": "leopard-intel-release-tests",
- "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["apple-macpro-4", "apple-pixel-1", "test-slave", "apple-macpro-7"]
- },
-
- { "name": "Leopard Intel Debug (Build)", "type": "Build", "builddir": "leopard-intel-debug",
+ "builders": [ { "name": "Leopard Intel Debug (Build)", "type": "Build", "builddir": "leopard-intel-debug",
"platform": "mac-leopard", "configuration": "debug", "architectures": ["i386"],
"triggers": ["leopard-intel-debug-tests"],
- "slavenames": ["apple-xserve-1", "apple-xserve-2", "test-slave"]
+ "slavenames": ["apple-xserve-1"]
},
{ "name": "Leopard Intel Debug (Tests)", "type": "Test", "builddir": "leopard-intel-debug-tests",
"platform": "mac-leopard", "configuration": "debug", "architectures": ["i386"],
- "slavenames": ["apple-xserve-3", "test-slave", "apple-macpro-5", "apple-macpro-6", "apple-macpro-7"]
+ "slavenames": ["apple-macpro-7"]
},
{ "name": "SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "snowleopard-intel-release",
"platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"],
@@ -121,6 +110,32 @@
"platform": "mac-snowleopard", "configuration": "debug", "architectures": ["x86_64"],
"slavenames": ["apple-xserve-9"]
},
+ { "name": "Lion Intel Debug (Build)", "type": "Build", "builddir": "lion-intel-debug",
+ "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
+ "triggers": ["lion-intel-debug-tests"],
+ "slavenames": ["apple-xserve-2"]
+ },
+ { "name": "Lion Intel Release (Build)", "type": "Build", "builddir": "lion-intel-release",
+ "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
+ "triggers": ["lion-intel-release-tests"],
+ "slavenames": ["apple-xserve-3"]
+ },
+ { "name": "Lion Intel Debug (Tests)", "type": "Test", "builddir": "lion-intel-debug-tests",
+ "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
+ "slavenames": ["apple-macpro-4"]
+ },
+ { "name": "Lion Intel Debug (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "lion-intel-debug-tests-wk2",
+ "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
+ "slavenames": ["apple-macpro-8"]
+ },
+ { "name": "Lion Intel Release (Tests)", "type": "Test", "builddir": "lion-intel-release-tests",
+ "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["apple-macpro-5", "apple-xserve-10"]
+ },
+ { "name": "Lion Intel Release (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "lion-intel-release-tests-wk2",
+ "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["apple-macpro-6"]
+ },
{
"name": "Windows Release (Build)", "type": "Build", "builddir": "win-release",
"platform": "win", "configuration": "release", "architectures": ["i386"],
@@ -263,12 +278,24 @@
"builderNames": ["SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks", "SnowLeopard Intel Debug (Build)",
"CSSRegions SnowLeopard Intel Release (Build)"]
},
+ { "type": "PlatformSpecificScheduler", "platform": "mac-lion", "branch": "trunk", "treeStableTimer": 45.0,
+ "builderNames": ["Lion Intel Release (Build)", "Lion Intel Debug (Build)"]
+ },
{ "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
"builderNames": ["Windows Release (Build)", "Windows Debug (Build)"]
},
- { "type": "Triggerable", "name": "leopard-intel-release-tests",
- "builderNames": ["Leopard Intel Release (Tests)"]
+ { "type": "Triggerable", "name": "lion-intel-release-tests",
+ "builderNames": ["Lion Intel Release (Tests)"]
},
+ { "type": "Triggerable", "name": "lion-intel-release-tests-wk2",
+ "builderNames": ["Lion Intel Release (WebKit2 Tests)"]
+ },
+ { "type": "Triggerable", "name": "lion-intel-debug-tests",
+ "builderNames": ["Lion Intel Debug (Tests)"]
+ },
+ { "type": "Triggerable", "name": "lion-intel-debug-tests-wk2",
+ "builderNames": ["Lion Intel Debug (WebKit2 Tests)"]
+ },
{ "type": "Triggerable", "name": "leopard-intel-debug-tests",
"builderNames": ["Leopard Intel Debug (Tests)"]
},
Modified: trunk/Tools/Scripts/webkitpy/common/config/build.py (92159 => 92160)
--- trunk/Tools/Scripts/webkitpy/common/config/build.py 2011-08-02 00:59:31 UTC (rev 92159)
+++ trunk/Tools/Scripts/webkitpy/common/config/build.py 2011-08-02 01:16:43 UTC (rev 92160)
@@ -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-leopard", "mac-snowleopard", "win"))
+ assert(target_platform in ("mac-leopard", "mac-lion", "mac-snowleopard", "win"))
directories = [
# Directories that shouldn't trigger builds on any bots.
@@ -72,8 +72,8 @@
("gtk", ["gtk"]),
("mac", ["chromium-mac", "mac"]),
("mac-leopard", ["mac-leopard"]),
- ("mac-snowleopard", ["mac", "win"]),
- ("mac-wk2", ["mac-snowleopard", "win"]),
+ ("mac-snowleopard", ["mac-leopard", "mac-snowleopard", "win"]),
+ ("mac-wk2", ["mac-lion", "mac-snowleopard", "win"]),
("objc", ["mac"]),
("qt", ["qt"]),
("skia", ["chromium"]),
Modified: trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py (92159 => 92160)
--- trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2011-08-02 00:59:31 UTC (rev 92159)
+++ trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2011-08-02 01:16:43 UTC (rev 92160)
@@ -31,27 +31,27 @@
(["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-snowleopard"]),
+ (["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/_javascript_Core/_javascript_Core.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
(["Source/_javascript_Glue/foo", "Source/WebCore/bar"], ["*"]),
- (["Source/_javascript_Glue/foo"], ["mac-leopard", "mac-snowleopard"]),
+ (["Source/_javascript_Glue/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
(["LayoutTests/foo"], ["*"]),
(["LayoutTests/canvas/philip/tests/size.attributes.parse.exp-expected.txt", "LayoutTests/canvas/philip/tests/size.attributes.parse.exp.html"], ["*"]),
(["LayoutTests/platform/chromium-linux/foo"], ["chromium-linux"]),
(["LayoutTests/platform/chromium-win/fast/compact/001-expected.txt"], ["chromium-win"]),
(["LayoutTests/platform/mac-leopard/foo"], ["mac-leopard"]),
(["LayoutTests/platform/mac-snowleopard/foo"], ["mac-leopard", "mac-snowleopard", "win"]),
- (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-snowleopard", "win"]),
- (["LayoutTests/platform/mac/foo"], ["mac-leopard", "mac-snowleopard", "win"]),
+ (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-lion", "mac-snowleopard", "win"]),
+ (["LayoutTests/platform/mac/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
(["LayoutTests/platform/win-xp/foo"], ["win"]),
(["LayoutTests/platform/win-wk2/foo"], ["win"]),
(["LayoutTests/platform/win/foo"], ["win"]),
- (["Source/WebCore.exp.in", "Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-snowleopard"]),
- (["Source/WebCore/mac/foo"], ["chromium-mac", "mac-leopard", "mac-snowleopard"]),
+ (["Source/WebCore.exp.in", "Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
+ (["Source/WebCore/mac/foo"], ["chromium-mac", "mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/WebCore/win/foo"], ["chromium-win", "win"]),
- (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-snowleopard"]),
+ (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/WebCore/platform/wx/wxcode/win/foo"], []),
- (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-snowleopard"]),
+ (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/WebCore/rendering/RenderThemeChromiumLinux.h"], ["chromium-linux"]),
(["Source/WebCore/rendering/RenderThemeWinCE.h"], []),
(["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
@@ -61,7 +61,7 @@
for files, platforms in self._should_build_tests:
# FIXME: We should test more platforms here once
# build._should_file_trigger_build is implemented for them.
- for platform in ["mac-leopard", "mac-snowleopard", "win"]:
+ for platform in ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]:
should_build = platform in platforms or "*" in platforms
self.assertEqual(build.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)))
