Changeset 92160 in webkit
- Timestamp:
- Aug 1, 2011, 6:16:43 PM (14 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
-
BuildSlaveSupport/build.webkit.org-config/config.json (modified) (5 diffs)
-
ChangeLog (modified) (1 diff)
-
Scripts/webkitpy/common/config/build.py (modified) (2 diffs)
-
Scripts/webkitpy/common/config/build_unittest.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
r91782 r92160 3 3 4 4 { "name": "apple-xserve-1", "platform": "mac-leopard" }, 5 { "name": "apple-xserve-2", "platform": "mac-leopard" }, 6 { "name": "apple-xserve-3", "platform": "mac-leopard" }, 7 5 { "name": "apple-macpro-7", "platform": "mac-leopard" }, 6 8 7 { "name": "apple-xserve-4", "platform": "mac-snowleopard" }, 9 8 { "name": "apple-xserve-5", "platform": "mac-snowleopard" }, … … 12 11 { "name": "apple-xserve-8", "platform": "mac-snowleopard" }, 13 12 { "name": "apple-xserve-9", "platform": "mac-snowleopard" }, 14 15 { "name": "apple-pixel-1", "platform": "mac-leopard" },16 17 13 { "name": "apple-macpro-1", "platform": "mac-snowleopard" }, 18 14 { "name": "apple-macpro-2", "platform": "mac-snowleopard" }, 19 15 { "name": "apple-macpro-3", "platform": "mac-snowleopard" }, 20 { "name": "apple-macpro-4", "platform": "mac-leopard" }, 21 { "name": "apple-macpro-5", "platform": "mac-leopard" }, 22 { "name": "apple-macpro-6", "platform": "mac-leopard" }, 23 { "name": "apple-macpro-7", "platform": "mac-leopard" }, 24 25 16 17 { "name": "apple-macpro-4", "platform": "mac-lion" }, 18 { "name": "apple-macpro-5", "platform": "mac-lion" }, 19 { "name": "apple-macpro-6", "platform": "mac-lion" }, 20 { "name": "apple-macpro-8", "platform": "mac-lion" }, 21 { "name": "apple-xserve-2", "platform": "mac-lion" }, 22 { "name": "apple-xserve-3", "platform": "mac-lion" }, 23 { "name": "apple-xserve-10", "platform": "mac-lion" }, 24 26 25 { "name": "apple-windows-1", "platform": "win"}, 27 26 { "name": "apple-windows-2", "platform": "win"}, … … 73 72 ], 74 73 75 "builders": [ { "name": "Leopard Intel Release (Build)", "type": "Build", "builddir": "leopard-intel-release", 76 "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"], 77 "triggers": ["leopard-intel-release-tests"], 78 "slavenames": ["apple-xserve-1", "apple-xserve-2", "test-slave"] 79 }, 80 { "name": "Leopard Intel Release (Tests)", "type": "Test", "builddir": "leopard-intel-release-tests", 81 "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"], 82 "slavenames": ["apple-macpro-4", "apple-pixel-1", "test-slave", "apple-macpro-7"] 83 }, 84 85 { "name": "Leopard Intel Debug (Build)", "type": "Build", "builddir": "leopard-intel-debug", 74 "builders": [ { "name": "Leopard Intel Debug (Build)", "type": "Build", "builddir": "leopard-intel-debug", 86 75 "platform": "mac-leopard", "configuration": "debug", "architectures": ["i386"], 87 76 "triggers": ["leopard-intel-debug-tests"], 88 "slavenames": ["apple-xserve-1" , "apple-xserve-2", "test-slave"]77 "slavenames": ["apple-xserve-1"] 89 78 }, 90 79 { "name": "Leopard Intel Debug (Tests)", "type": "Test", "builddir": "leopard-intel-debug-tests", 91 80 "platform": "mac-leopard", "configuration": "debug", "architectures": ["i386"], 92 "slavenames": ["apple- xserve-3", "test-slave", "apple-macpro-5", "apple-macpro-6", "apple-macpro-7"]81 "slavenames": ["apple-macpro-7"] 93 82 }, 94 83 { "name": "SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "snowleopard-intel-release", … … 121 110 "platform": "mac-snowleopard", "configuration": "debug", "architectures": ["x86_64"], 122 111 "slavenames": ["apple-xserve-9"] 112 }, 113 { "name": "Lion Intel Debug (Build)", "type": "Build", "builddir": "lion-intel-debug", 114 "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"], 115 "triggers": ["lion-intel-debug-tests"], 116 "slavenames": ["apple-xserve-2"] 117 }, 118 { "name": "Lion Intel Release (Build)", "type": "Build", "builddir": "lion-intel-release", 119 "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"], 120 "triggers": ["lion-intel-release-tests"], 121 "slavenames": ["apple-xserve-3"] 122 }, 123 { "name": "Lion Intel Debug (Tests)", "type": "Test", "builddir": "lion-intel-debug-tests", 124 "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"], 125 "slavenames": ["apple-macpro-4"] 126 }, 127 { "name": "Lion Intel Debug (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "lion-intel-debug-tests-wk2", 128 "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"], 129 "slavenames": ["apple-macpro-8"] 130 }, 131 { "name": "Lion Intel Release (Tests)", "type": "Test", "builddir": "lion-intel-release-tests", 132 "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"], 133 "slavenames": ["apple-macpro-5", "apple-xserve-10"] 134 }, 135 { "name": "Lion Intel Release (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "lion-intel-release-tests-wk2", 136 "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"], 137 "slavenames": ["apple-macpro-6"] 123 138 }, 124 139 { … … 264 279 "CSSRegions SnowLeopard Intel Release (Build)"] 265 280 }, 281 { "type": "PlatformSpecificScheduler", "platform": "mac-lion", "branch": "trunk", "treeStableTimer": 45.0, 282 "builderNames": ["Lion Intel Release (Build)", "Lion Intel Debug (Build)"] 283 }, 266 284 { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0, 267 285 "builderNames": ["Windows Release (Build)", "Windows Debug (Build)"] 268 286 }, 269 { "type": "Triggerable", "name": "leopard-intel-release-tests", 270 "builderNames": ["Leopard Intel Release (Tests)"] 287 { "type": "Triggerable", "name": "lion-intel-release-tests", 288 "builderNames": ["Lion Intel Release (Tests)"] 289 }, 290 { "type": "Triggerable", "name": "lion-intel-release-tests-wk2", 291 "builderNames": ["Lion Intel Release (WebKit2 Tests)"] 292 }, 293 { "type": "Triggerable", "name": "lion-intel-debug-tests", 294 "builderNames": ["Lion Intel Debug (Tests)"] 295 }, 296 { "type": "Triggerable", "name": "lion-intel-debug-tests-wk2", 297 "builderNames": ["Lion Intel Debug (WebKit2 Tests)"] 271 298 }, 272 299 { "type": "Triggerable", "name": "leopard-intel-debug-tests", -
trunk/Tools/ChangeLog
r92153 r92160 1 2011-08-01 Stephanie Lewis <slewis@apple.com> 2 3 Finish reconfiguration started by Lucas Forschler 4 Reconfigured slaves: 5 Removed Leopard Intel Release (Build) 6 Removed Leopard Intel Release (Tests) 7 Remove apple-pixel-1 8 Added Lion slaves from disabled Leopard slaves 9 10 Added builders: 11 Lion Intel Release (Build) 12 Lion Intel Debug (Build) 13 Lion Intel Release (Tests) 14 Lion Intel Release WK2 (Tests) 15 Lion Intel Debug (Tests) 16 Lion Intel Debug WK2 (Tests) 17 18 Added triggers: 19 lion-intel-debug-tests 20 lion-intel-debug-test-wk2 21 lion-intel-release-tests 22 lion-intel-release-tests-wk2 23 24 Removed trigger: 25 leopard-intel-release-tests 26 27 Added PlatformSpecificScheduler: 28 mac-lion 29 30 Added "mac-lion" to build.py and build_unitttest.py 31 32 Reviewed by Mark Rowe. 33 34 * BuildSlaveSupport/build.webkit.org-config/config.json: 35 * Scripts/webkitpy/common/config/build.py: 36 * Scripts/webkitpy/common/config/build_unittest.py: 37 38 1 39 2011-08-01 Adam Barth <abarth@webkit.org> 2 40 -
trunk/Tools/Scripts/webkitpy/common/config/build.py
r82679 r92160 38 38 # will have to figure out what the right set of directories/patterns is for 39 39 # that platform. 40 assert(target_platform in ("mac-leopard", "mac- snowleopard", "win"))40 assert(target_platform in ("mac-leopard", "mac-lion", "mac-snowleopard", "win")) 41 41 42 42 directories = [ … … 73 73 ("mac", ["chromium-mac", "mac"]), 74 74 ("mac-leopard", ["mac-leopard"]), 75 ("mac-snowleopard", ["mac ", "win"]),76 ("mac-wk2", ["mac- snowleopard", "win"]),75 ("mac-snowleopard", ["mac-leopard", "mac-snowleopard", "win"]), 76 ("mac-wk2", ["mac-lion", "mac-snowleopard", "win"]), 77 77 ("objc", ["mac"]), 78 78 ("qt", ["qt"]), -
trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py
r82679 r92160 32 32 (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]), 33 33 (["Websites/bugs.webkit.org/foo"], []), 34 (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-leopard", "mac- snowleopard"]),34 (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]), 35 35 (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]), 36 36 (["Source/JavaScriptGlue/foo", "Source/WebCore/bar"], ["*"]), 37 (["Source/JavaScriptGlue/foo"], ["mac-leopard", "mac- snowleopard"]),37 (["Source/JavaScriptGlue/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]), 38 38 (["LayoutTests/foo"], ["*"]), 39 39 (["LayoutTests/canvas/philip/tests/size.attributes.parse.exp-expected.txt", "LayoutTests/canvas/philip/tests/size.attributes.parse.exp.html"], ["*"]), … … 42 42 (["LayoutTests/platform/mac-leopard/foo"], ["mac-leopard"]), 43 43 (["LayoutTests/platform/mac-snowleopard/foo"], ["mac-leopard", "mac-snowleopard", "win"]), 44 (["LayoutTests/platform/mac-wk2/Skipped"], ["mac- snowleopard", "win"]),45 (["LayoutTests/platform/mac/foo"], ["mac-leopard", "mac- snowleopard", "win"]),44 (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-lion", "mac-snowleopard", "win"]), 45 (["LayoutTests/platform/mac/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]), 46 46 (["LayoutTests/platform/win-xp/foo"], ["win"]), 47 47 (["LayoutTests/platform/win-wk2/foo"], ["win"]), 48 48 (["LayoutTests/platform/win/foo"], ["win"]), 49 (["Source/WebCore.exp.in", "Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac- snowleopard"]),50 (["Source/WebCore/mac/foo"], ["chromium-mac", "mac-leopard", "mac- snowleopard"]),49 (["Source/WebCore.exp.in", "Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-lion", "mac-snowleopard"]), 50 (["Source/WebCore/mac/foo"], ["chromium-mac", "mac-leopard", "mac-lion", "mac-snowleopard"]), 51 51 (["Source/WebCore/win/foo"], ["chromium-win", "win"]), 52 (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac- snowleopard"]),52 (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]), 53 53 (["Source/WebCore/platform/wx/wxcode/win/foo"], []), 54 (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac- snowleopard"]),54 (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-lion", "mac-snowleopard"]), 55 55 (["Source/WebCore/rendering/RenderThemeChromiumLinux.h"], ["chromium-linux"]), 56 56 (["Source/WebCore/rendering/RenderThemeWinCE.h"], []), … … 62 62 # FIXME: We should test more platforms here once 63 63 # build._should_file_trigger_build is implemented for them. 64 for platform in ["mac-leopard", "mac- snowleopard", "win"]:64 for platform in ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]: 65 65 should_build = platform in platforms or "*" in platforms 66 66 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)))
Note:
See TracChangeset
for help on using the changeset viewer.
