Add WebKit2 Mac tester to buildbot.
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Aug 2010 00:46:14 +0000 (00:46 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Aug 2010 00:46:14 +0000 (00:46 +0000)
Reviewed by Mark Rowe.

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

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

WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
WebKitTools/ChangeLog

index eda05f1..49d770d 100644 (file)
@@ -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",
                       "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"],
                     { "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)"]
                     },
index 35566e0..acedbd2 100644 (file)
@@ -309,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"]
@@ -408,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.
index 8b85ea3..96bda63 100644 (file)
@@ -1,3 +1,12 @@
+2010-08-16  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Add WebKit2 Mac tester to buildbot.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
 2010-08-16  Paul Sawaya  <psawaya@apple.com>
 
         Reviewed by Chris Marrin.