Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (90803 => 90804)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2011-07-12 02:11:28 UTC (rev 90803)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2011-07-12 02:17:34 UTC (rev 90804)
@@ -193,26 +193,26 @@
"slavenames": ["google-windows-1"]
},
{
+ "name": "Chromium Win Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-win-release-tests",
+ "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
+ "slavenames": ["google-windows-2"]
+ },
+ {
"name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release",
"platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-mac-1", "google-mac-3"]
},
{
+ "name": "Chromium Mac Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-mac-release-tests",
+ "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
+ "slavenames": ["google-mac-2", "google-mac-4"]
+ },
+ {
"name": "Chromium Linux Release", "type": "Build", "builddir": "chromium-linux-release",
"platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-linux-1"]
},
{
- "name": "Chromium Win Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-win-release-tests",
- "platform": "chromium-win", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["google-windows-2"]
- },
- {
- "name": "Chromium Mac Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-mac-release-tests",
- "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["google-mac-2", "google-mac-4"]
- },
- {
"name": "Chromium Linux Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-linux-release-tests",
"platform": "chromium-linux", "configuration": "release", "architectures": ["i386"],
"slavenames": ["google-linux-2"]
@@ -257,8 +257,8 @@
"builderNames": ["GTK Linux 32-bit Release", "GTK Linux 32-bit Debug", "GTK Linux 64-bit Debug",
"Qt Linux Release", "Qt Linux Release minimal", "Qt Linux ARMv7 Release",
"Qt Windows 32-bit Release", "Qt Windows 32-bit Debug",
- "Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release",
- "Chromium Win Release (Tests)", "Chromium Mac Release (Tests)", "Chromium Linux Release (Tests)", "Chromium Linux Release (Flexbox)",
+ "Chromium Win Release", "Chromium Win Release (Tests)", "Chromium Mac Release", "Chromium Mac Release (Tests)",
+ "Chromium Linux Release", "Chromium Linux Release (Tests)", "Chromium Linux Release (Flexbox)",
"WinCairo Debug (Build)", "WinCE Release (Build)", "EFL Linux Release (Build)"]
},
{ "type": "PlatformSpecificScheduler", "platform": "mac-leopard", "branch": "trunk", "treeStableTimer": 45.0,
Modified: trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py (90803 => 90804)
--- trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py 2011-07-12 02:11:28 UTC (rev 90803)
+++ trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py 2011-07-12 02:17:34 UTC (rev 90804)
@@ -262,10 +262,10 @@
{'name': u'Qt Windows 32-bit Release', },
{'name': u'Qt Windows 32-bit Debug', },
{'name': u'Chromium Win Release', },
+ {'name': u'Chromium Win Release (Tests)', },
{'name': u'Chromium Mac Release', },
+ {'name': u'Chromium Mac Release (Tests)', },
{'name': u'Chromium Linux Release', },
- {'name': u'Chromium Win Release (Tests)', },
- {'name': u'Chromium Mac Release (Tests)', },
{'name': u'Chromium Linux Release (Tests)', },
{'name': u'Leopard Intel Release (NRWT)', },
{'name': u'SnowLeopard Intel Release (NRWT)', },
@@ -288,6 +288,7 @@
"GTK.*64.*Debug", # Disallow the 64-bit Release bot which is broken.
"Qt",
"Chromium.*Release$",
+ "Chromium.*(Mac|Linux).*Release.*\(Tests",
]
expected_builders = [
{'name': u'Leopard Intel Release (Build)', },
@@ -311,7 +312,9 @@
{'name': u'Qt Windows 32-bit Debug', },
{'name': u'Chromium Win Release', },
{'name': u'Chromium Mac Release', },
+ {'name': u'Chromium Mac Release (Tests)', },
{'name': u'Chromium Linux Release', },
+ {'name': u'Chromium Linux Release (Tests)', },
{'name': u'WinCairo Debug (Build)', },
{'name': u'WinCE Release (Build)', },
{'name': u'EFL Linux Release (Build)', },