diff options
Diffstat (limited to 'WebKitTools/BuildSlaveSupport')
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json | 10 | ||||
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg | 11 |
2 files changed, 20 insertions, 1 deletions
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json index eda05f1..49d770d 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -8,6 +8,7 @@ { "name": "apple-xserve-4", "platform": "mac-snowleopard" }, { "name": "apple-xserve-5", "platform": "mac-snowleopard" }, { "name": "apple-xserve-6", "platform": "mac-snowleopard" }, + { "name": "apple-xserve-7", "platform": "mac-snowleopard" }, { "name": "apple-pixel-1", "platform": "mac-leopard" }, @@ -66,7 +67,7 @@ }, { "name": "SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "snowleopard-intel-release", "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"], - "triggers": ["snowleopard-intel-release-tests"], + "triggers": ["snowleopard-intel-release-tests", "snowleopard-intel-release-tests-wk2"], "slavenames": ["apple-xserve-4", "test-slave"] }, { "name": "SnowLeopard Intel Release (Tests)", "type": "Test", "builddir": "snowleopard-intel-release-tests", @@ -77,6 +78,10 @@ "platform": "mac-snowleopard", "configuration": "debug", "architectures": ["x86_64"], "slavenames": ["apple-macpro-1", "apple-macpro-3", "test-slave"] }, + { "name": "SnowLeopard Intel Release (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "snowleopard-intel-release-tests-wk2", + "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"], + "slavenames": ["apple-xserve-7", "test-slave"] + }, { "name": "Windows Release (Build)", "type": "Build", "builddir": "win-release", "platform": "win", "configuration": "release", "architectures": ["i386"], @@ -205,6 +210,9 @@ { "type": "Triggerable", "name": "snowleopard-intel-release-tests", "builderNames": ["SnowLeopard Intel Release (Tests)"] }, + { "type": "Triggerable", "name": "snowleopard-intel-release-tests-wk2", + "builderNames": ["SnowLeopard Intel Release (WebKit2 Tests)"] + }, { "type": "Triggerable", "name": "win-release-tests", "builderNames": ["Windows Release (Tests)"] }, diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg index 5ff4681..acedbd2 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -247,6 +247,9 @@ class RunWebKitTests(shell.Test): class NewRunWebKitTests(RunWebKitTests): command = ["python", "./WebKitTools/Scripts/new-run-webkit-tests", "--noshow-results", "--verbose", "--results-directory", "layout-test-results", + "--builder-name", WithProperties("%(buildername)s"), + "--build-number", WithProperties("%(buildnumber)s"), + "--test-results-server", "test-results.appspot.com", WithProperties("--%(configuration)s"), "--use-drt"] @@ -306,6 +309,12 @@ class RunWebKitLeakTests(RunWebKitTests): return RunWebKitTests.start(self) +class RunWebKit2Tests(RunWebKitTests): + def start(self): + self.setCommand(self.command + ["--webkit-test-runner"]) + return RunWebKitTests.start(self) + + class ArchiveTestResults(shell.ShellCommand): command = ["python", "./WebKitTools/BuildSlaveSupport/test-result-archive", WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"), "archive"] @@ -405,6 +414,8 @@ class BuildAndTestLeaksFactory(BuildAndTestFactory): class NewBuildAndTestFactory(BuildAndTestFactory): TestClass = NewRunWebKitTests +class TestWebKit2Factory(TestFactory): + TestClass = RunWebKit2Tests def loadBuilderConfig(c): # FIXME: These file handles are leaked. |