[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 91572f0b68e22da94989b003592b9346b06f3217
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 00:46:14 2010 +0000

    Add WebKit2 Mac tester to buildbot.
    
    Reviewed by Mark Rowe.
    
    * BuildSlaveSupport/build.webkit.org-config/config.json:
    * BuildSlaveSupport/build.webkit.org-config/master.cfg:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65473 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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 35566e0..acedbd2 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -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.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8b85ea3..96bda63 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-16  Sam Weinig  <sam at 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 at apple.com>
 
         Reviewed by Chris Marrin.

-- 
WebKit Debian packaging