diff options
Diffstat (limited to 'WebKitTools/BuildSlaveSupport')
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json | 23 | ||||
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg | 7 |
2 files changed, 25 insertions, 5 deletions
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json index 2a4a351..91a13e7 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -45,7 +45,11 @@ { "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" } + { "name": "google-new-tests", "platform": "mac-leopard" }, + + { "name": "wincairo-1", "platform": "wincairo" }, + + { "name": "efl-linux-slave-1", "platform": "efl" } ], "builders": [ { "name": "Leopard Intel Release (Build)", "type": "Build", "builddir": "leopard-intel-release", @@ -93,7 +97,7 @@ { "name": "Windows Release (Tests)", "type": "Test", "builddir": "win-release-tests", "platform": "win", "configuration": "release", "architectures": ["i386"], - "slavenames": ["apple-windows-4", "apple-windows-3", "apple-windows-5", "apple-windows-6", "test-slave"] + "slavenames": ["apple-windows-3", "apple-windows-5", "test-slave"] }, { "name": "Windows Debug (Build)", "type": "Build", "builddir": "win-debug", @@ -104,7 +108,7 @@ { "name": "Windows Debug (Tests)", "type": "Test", "builddir": "win-debug-tests", "platform": "win", "configuration": "debug", "architectures": ["i386"], - "slavenames": ["apple-windows-4", "apple-windows-3", "apple-windows-5", "apple-windows-6", "test-slave"] + "slavenames": ["apple-windows-4", "apple-windows-6", "test-slave"] }, { "name": "Windows Debug (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "win-debug-tests-wk2", "platform": "win", "configuration": "debug", "architectures": ["i386"], @@ -194,6 +198,16 @@ "name": "New run-webkit-tests", "type": "NewBuildAndTest", "builddir": "google-new-tests", "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"], "slavenames": ["google-new-tests"] + }, + { + "name": "WinCairo Debug (Build)", "type": "Build", "builddir": "win-cairo-debug", + "platform": "wincairo", "configuration": "debug", "architectures": ["i386"], + "slavenames": ["wincairo-1"] + }, + { + "name": "EFL Linux Release (Build)", "type": "Build", "builddir": "efl-linux-release", + "platform": "efl", "configuration": "release", "architectures": ["i386"], + "slavenames": ["efl-linux-slave-1"] } ], @@ -205,7 +219,8 @@ "Qt Linux Release", "Qt Linux Release minimal", "Qt Linux ARMv5 Release", "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 Win Release (Tests)", "Chromium Mac Release (Tests)", "Chromium Linux Release (Tests)", + "WinCairo Debug (Build)", "EFL Linux Release (Build)"] }, { "type": "Triggerable", "name": "leopard-intel-release-tests", "builderNames": ["Leopard Intel Release (Tests)"] diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg index d5cd6fb..47af8d2 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -78,7 +78,7 @@ class CleanupChromiumLinuxCrashLogs(shell.ShellCommand): def appendCustomBuildFlags(step, platform): - if platform in ('gtk', 'wx', 'qt', 'chromium'): + if platform in ('gtk', 'wx', 'qt', 'chromium', 'wincairo', 'efl'): step.setCommand(step.command + ['--' + platform]) @@ -487,3 +487,8 @@ c['slavePortnum'] = 17000 c['projectName'] = "WebKit" c['projectURL'] = "http://webkit.org" c['buildbotURL'] = "http://build.webkit.org/" + +c['buildHorizon'] = 1000 +c['logHorizon'] = 500 +c['eventHorizon'] = 200 +c['buildCacheSize'] = 60 |