diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 10:46:49 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:34 +0100 |
| commit | 0617145a89917ae7735fe1c9538688ab9a577df5 (patch) | |
| tree | 56206078694427c37ed7bdf27eb5221398b833c0 /WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json | |
| parent | ef1adcdfc805d4d13103f6f15cc5b4d96828a60f (diff) | |
| download | external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.zip external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.gz external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.bz2 | |
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Diffstat (limited to 'WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json')
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json index 93f1c11..f4b0822 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -35,12 +35,12 @@ { "name": "szeged-windows-1", "platform": "qt"}, { "name": "szeged-windows-2", "platform": "qt"}, - { "name": "google-windows-1", "platform": "chromium" }, - { "name": "google-mac-1", "platform": "chromium" }, - { "name": "google-linux-1", "platform": "chromium" }, - { "name": "google-windows-2", "platform": "chromium" }, - { "name": "google-mac-2", "platform": "chromium" }, - { "name": "google-linux-2", "platform": "chromium" }, + { "name": "google-windows-1", "platform": "chromium-win" }, + { "name": "google-mac-1", "platform": "chromium-mac" }, + { "name": "google-linux-1", "platform": "chromium-linux" }, + { "name": "google-windows-2", "platform": "chromium-win" }, + { "name": "google-mac-2", "platform": "chromium-mac" }, + { "name": "google-linux-2", "platform": "chromium-linux" }, { "name": "google-new-tests", "platform": "mac-leopard" } ], @@ -150,32 +150,32 @@ }, { "name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release", - "platform": "chromium", "configuration": "release", "architectures": ["i386"], + "platform": "chromium-win", "configuration": "release", "architectures": ["i386"], "slavenames": ["google-windows-1"] }, { "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release", - "platform": "chromium", "configuration": "release", "architectures": ["i386"], + "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"], "slavenames": ["google-mac-1"] }, { "name": "Chromium Linux Release", "type": "Build", "builddir": "chromium-linux-release", - "platform": "chromium", "configuration": "release", "architectures": ["i386"], + "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", "configuration": "release", "architectures": ["i386"], + "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", "configuration": "release", "architectures": ["i386"], + "platform": "chromium-mac", "configuration": "release", "architectures": ["i386"], "slavenames": ["google-mac-2"] }, { "name": "Chromium Linux Release (Tests)", "type": "NewBuildAndTest", "builddir": "chromium-linux-release-tests", - "platform": "chromium", "configuration": "release", "architectures": ["i386"], + "platform": "chromium-linux", "configuration": "release", "architectures": ["i386"], "slavenames": ["google-linux-2"] }, { |