Wrap bot types inside ().

https://bugs.webkit.org/show_bug.cgi?id=88893

Reviewed by Stephanie Lewis.

* BuildSlaveSupport/build.webkit.org-config/config.json:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
index 4c31d177513ef2e33410a439bfe9f34dee4de855..b51c525ebdc90aab026de09cda95998e1a7afc31 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -66,68 +66,68 @@
                     { "name": "hfreyther-sh4-linux1", "platform": "qt"}
                   ],
 
-    "builders":   [ { "name": "Apple SnowLeopard Release Build", "type": "Build", "builddir": "snowleopard-release",
+    "builders":   [ { "name": "Apple SnowLeopard Release (Build)", "type": "Build", "builddir": "snowleopard-release",
                       "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["apple-xserve-4"]
                     },
-                    { "name": "Apple SnowLeopard Debug Build", "type": "Build", "builddir": "snowleopard-debug",
+                    { "name": "Apple SnowLeopard Debug (Build)", "type": "Build", "builddir": "snowleopard-debug",
                       "platform": "mac-snowleopard", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["apple-xserve-9"]
                     },
-                    { "name": "Apple Lion Leaks", "type": "BuildAndTestLeaks", "builddir": "lion-leaks",
+                    { "name": "Apple Lion (Leaks)", "type": "BuildAndTestLeaks", "builddir": "lion-leaks",
                       "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["apple-macpro-3"]
                     },
-                    { "name": "Apple Lion Debug Build", "type": "Build", "builddir": "lion-debug",
+                    { "name": "Apple Lion Debug (Build)", "type": "Build", "builddir": "lion-debug",
                       "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["lion-debug-tests-wk1", "lion-debug-tests-wk2"],
                       "slavenames": ["apple-xserve-2", "apple-xserve-10"]
                     },
-                    { "name": "Apple Lion Release Build", "type": "Build", "builddir": "lion-release",
+                    { "name": "Apple Lion Release (Build)", "type": "Build", "builddir": "lion-release",
                       "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["lion-release-tests-wk1", "lion-release-tests-wk2", "lion-release-perf"],
                       "slavenames": ["apple-xserve-3"]
                     },
-                    { "name": "Apple Lion Debug WK1 Tests", "type": "Test", "builddir": "lion-debug-tests-wk1",
+                    { "name": "Apple Lion Debug WK1 (Tests)", "type": "Test", "builddir": "lion-debug-tests-wk1",
                       "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["apple-macpro-4"]
                     },
-                    { "name": "Apple Lion Debug WK2 Tests", "type": "TestWebKit2", "builddir": "lion-debug-tests-wk2",
+                    { "name": "Apple Lion Debug WK2 (Tests)", "type": "TestWebKit2", "builddir": "lion-debug-tests-wk2",
                       "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["apple-macpro-8", "apple-xserve-1"]
                     },
-                    { "name": "Apple Lion Release WK1 Tests", "type": "Test", "builddir": "lion-release-tests-wk1",
+                    { "name": "Apple Lion Release WK1 (Tests)", "type": "Test", "builddir": "lion-release-tests-wk1",
                       "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["apple-macpro-5"]
                     },
-                    { "name": "Apple Lion Release WK2 Tests", "type": "TestWebKit2", "builddir": "lion-release-tests-wk2",
+                    { "name": "Apple Lion Release WK2 (Tests)", "type": "TestWebKit2", "builddir": "lion-release-tests-wk2",
                       "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["apple-macpro-6"]
                     },
                     {
-                      "name": "Apple Lion Release Perf", "type": "DownloadAndPerfTest", "builddir": "lion-release-perf-tests",
+                      "name": "Apple Lion Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "lion-release-perf-tests",
                       "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["apple-xserve-11"]
                     },
                     {
-                      "name": "Apple Win Release Build", "type": "Build", "builddir": "win-release",
+                      "name": "Apple Win Release (Build)", "type": "Build", "builddir": "win-release",
                       "platform": "win", "configuration": "release", "architectures": ["i386"],
                       "triggers": ["win-release-tests"],
                       "slavenames": ["apple-windows-2"]
                     },
                     {
-                      "name": "Apple Win 7 Release Tests", "type": "Test", "builddir": "win-release-tests",
+                      "name": "Apple Win 7 Release (Tests)", "type": "Test", "builddir": "win-release-tests",
                       "platform": "win", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["apple-windows-5", "apple-windows-6"]
                     },
                     {
-                      "name": "Apple Win Debug Build", "type": "Build", "builddir": "win-debug",
+                      "name": "Apple Win Debug (Build)", "type": "Build", "builddir": "win-debug",
                       "platform": "win", "configuration": "debug", "architectures": ["i386"],
                       "triggers": ["win-debug-tests"],
                       "slavenames": ["apple-windows-1"]
                     },
                     {
-                      "name": "Apple Win XP Debug Tests", "type": "Test", "builddir": "win-debug-tests",
+                      "name": "Apple Win XP Debug (Tests)", "type": "Test", "builddir": "win-debug-tests",
                       "platform": "win", "configuration": "debug", "architectures": ["i386"],
                       "slavenames": ["apple-windows-3", "apple-windows-4", "apple-windows-13", "apple-windows-14", "apple-windows-15"]
                     },
@@ -288,34 +288,34 @@
                                        "WinCairo Release", "WinCE Release (Build)"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "mac-snowleopard", "branch": "trunk", "treeStableTimer": 45.0, 
-                      "builderNames": ["Apple SnowLeopard Release Build", "Apple SnowLeopard Debug Build"] 
+                      "builderNames": ["Apple SnowLeopard Release (Build)", "Apple SnowLeopard Debug (Build)"] 
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "mac-lion", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple Lion Release Build", "Apple Lion Debug Build", "Apple Lion Leaks"]
+                      "builderNames": ["Apple Lion Release (Build)", "Apple Lion Debug (Build)", "Apple Lion (Leaks)"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple Win Release Build", "Apple Win Debug Build"]
+                      "builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
                     },
                     { "type": "Triggerable", "name": "lion-release-tests-wk1",
-                      "builderNames": ["Apple Lion Release WK1 Tests"]
+                      "builderNames": ["Apple Lion Release WK1 (Tests)"]
                     },
                     { "type": "Triggerable", "name": "lion-release-tests-wk2",
-                      "builderNames": ["Apple Lion Release WK2 Tests"]
+                      "builderNames": ["Apple Lion Release WK2 (Tests)"]
                     },
                     { "type": "Triggerable", "name": "lion-release-perf",
-                      "builderNames": ["Apple Lion Release Perf"]
+                      "builderNames": ["Apple Lion Release (Perf)"]
                     },
                     { "type": "Triggerable", "name": "lion-debug-tests-wk1",
-                      "builderNames": ["Apple Lion Debug WK1 Tests"]
+                      "builderNames": ["Apple Lion Debug WK1 (Tests)"]
                     },
                     { "type": "Triggerable", "name": "lion-debug-tests-wk2",
-                      "builderNames": ["Apple Lion Debug WK2 Tests"]
+                      "builderNames": ["Apple Lion Debug WK2 (Tests)"]
                     },
                     { "type": "Triggerable", "name": "win-release-tests",
-                      "builderNames": ["Apple Win 7 Release Tests"]
+                      "builderNames": ["Apple Win 7 Release (Tests)"]
                     },
                     { "type": "Triggerable", "name": "win-debug-tests",
-                      "builderNames": ["Apple Win XP Debug Tests"]
+                      "builderNames": ["Apple Win XP Debug (Tests)"]
                     },
                     { "type": "Triggerable", "name": "chromium-win-release-tests",
                       "builderNames": ["Chromium Win Release (Tests)"]

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8c48545efe17a1c8ca87d449e7db2df96d13806b..0758a9fc525452011a1604c1ac1a5dce7b7670c3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-12  Lucas Forschler  <lforschler@apple.com>
+
+        Wrap bot types inside ().
+        https://bugs.webkit.org/show_bug.cgi?id=88893
+        
+        Reviewed by Stephanie Lewis.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+
 2012-06-12  Christophe Dumez  <christophe.dumez@intel.com>
 
         [soup] Prevent setting or editing httpOnly cookies from JavaScript