diff options
Diffstat (limited to 'WebKitTools/BuildSlaveSupport')
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json | 20 | ||||
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg | 10 |
2 files changed, 21 insertions, 9 deletions
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json index f39e10c..868ee0d 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -95,9 +95,9 @@ "slavenames": ["apple-windows-2", "test-slave"] }, { - "name": "Windows Release (Tests)", "type": "Test", "builddir": "win-release-tests", + "name": "Windows 7 Release (Tests)", "type": "Test", "builddir": "win-release-tests", "platform": "win", "configuration": "release", "architectures": ["i386"], - "slavenames": ["apple-windows-3", "apple-windows-5", "test-slave"] + "slavenames": ["apple-windows-5", "apple-windows-6", "test-slave"] }, { "name": "Windows Debug (Build)", "type": "Build", "builddir": "win-debug", @@ -106,11 +106,11 @@ "slavenames": ["apple-windows-1", "test-slave"] }, { - "name": "Windows Debug (Tests)", "type": "Test", "builddir": "win-debug-tests", + "name": "Windows XP Debug (Tests)", "type": "Test", "builddir": "win-debug-tests", "platform": "win", "configuration": "debug", "architectures": ["i386"], - "slavenames": ["apple-windows-4", "apple-windows-6", "test-slave"] + "slavenames": ["apple-windows-3", "apple-windows-4", "test-slave"] }, - { "name": "Windows Release (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "win-release-tests-wk2", + { "name": "Windows 7 Release (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "win-release-tests-wk2", "platform": "win", "configuration": "release", "architectures": ["i386"], "slavenames": ["apple-windows-7", "test-slave"] }, @@ -214,7 +214,6 @@ "schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "change_filter": "trunk_filter", "treeStableTimer": 45.0, "builderNames": ["Leopard Intel Release (Build)", "Leopard Intel Debug (Build)", "SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks", - "Windows Release (Build)", "Windows Debug (Build)", "GTK Linux 32-bit Release", "GTK Linux 32-bit Debug", "GTK Linux 64-bit Debug", "GTK Linux 64-bit Release", "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", @@ -222,6 +221,9 @@ "Chromium Win Release (Tests)", "Chromium Mac Release (Tests)", "Chromium Linux Release (Tests)", "WinCairo Debug (Build)", "EFL Linux Release (Build)"] }, + { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0, + "builderNames": ["Windows Release (Build)", "Windows Debug (Build)"] + }, { "type": "Triggerable", "name": "leopard-intel-release-tests", "builderNames": ["Leopard Intel Release (Tests)"] }, @@ -235,13 +237,13 @@ "builderNames": ["SnowLeopard Intel Release (WebKit2 Tests)"] }, { "type": "Triggerable", "name": "win-release-tests", - "builderNames": ["Windows Release (Tests)"] + "builderNames": ["Windows 7 Release (Tests)"] }, { "type": "Triggerable", "name": "win-debug-tests", - "builderNames": ["Windows Debug (Tests)"] + "builderNames": ["Windows XP Debug (Tests)"] }, { "type": "Triggerable", "name": "win-release-tests-wk2", - "builderNames": ["Windows Release (WebKit2 Tests)"] + "builderNames": ["Windows 7 Release (WebKit2 Tests)"] } ] } diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg index 97641bf..c28abb6 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -17,6 +17,7 @@ from twisted.internet import defer import re import simplejson +from webkitpy.common.config import build as wkbuild from webkitpy.common.net.buildbot import BuildBot as wkbuildbot WithProperties = properties.WithProperties @@ -478,6 +479,15 @@ class NewBuildAndTestFactory(BuildAndTestFactory): class TestWebKit2Factory(TestFactory): TestClass = RunWebKit2Tests +class PlatformSpecificScheduler(AnyBranchScheduler): + def __init__(self, platform, branch, **kwargs): + self.platform = platform + filter = ChangeFilter(branch=[branch, None], filter_fn=self.filter) + AnyBranchScheduler.__init__(self, name=platform, change_filter=filter, **kwargs) + + def filter(self, change): + return wkbuild.should_build(self.platform, change.files) + trunk_filter = ChangeFilter(branch=["trunk", None]) def loadBuilderConfig(c): |