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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 86bd14f7b8405034c13e86aed5d13090312c9340
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 1 14:29:20 2010 +0000

    Trigger the Windows Release WebKit2 tests when a Release build finishes, not when a Debug build finishes
    
    Fixes <http://webkit.org/b/48754> Windows Release WebKit2 tests are
    triggered at the wrong time
    
    Reviewed by Sam Weinig.
    
    * BuildSlaveSupport/build.webkit.org-config/config.json: Fixed
    triggerable name and trigger.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71022 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 81e9b15..6a29cfb 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -90,8 +90,8 @@
                     },
                     {
                       "name": "Windows Release (Build)", "type": "Build", "builddir": "win-release",
-                      "platform": "win", "configuration": "release", "architectures": ["i386"],
-                      "triggers": ["win-release-tests"],
+                      "platform": "win", "configuratio, "win-releasen": "release", "architectures": ["i386"],
+                      "triggers": ["win-release-tests", "win-release-tests-wk2"],
                       "slavenames": ["apple-windows-2", "test-slave"]
                     },
                     {
@@ -102,7 +102,7 @@
                     {
                       "name": "Windows Debug (Build)", "type": "Build", "builddir": "win-debug",
                       "platform": "win", "configuration": "debug", "architectures": ["i386"],
-                      "triggers": ["win-debug-tests", "win-debug-tests-wk2"],
+                      "triggers": ["win-debug-tests"],
                       "slavenames": ["apple-windows-1", "test-slave"]
                     },
                     {
@@ -240,7 +240,7 @@
                     { "type": "Triggerable", "name": "win-debug-tests",
                       "builderNames": ["Windows Debug (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "win-debug-tests-wk2",
+                    { "type": "Triggerable", "name": "win-release-tests-wk2",
                       "builderNames": ["Windows Release (WebKit2 Tests)"]
                     }
                   ]
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1fb1637..4b0199d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-01  Adam Roben  <aroben at apple.com>
+
+        Trigger the Windows Release WebKit2 tests when a Release build
+        finishes, not when a Debug build finishes
+
+        Fixes <http://webkit.org/b/48754> Windows Release WebKit2 tests are
+        triggered at the wrong time
+
+        Reviewed by Sam Weinig.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json: Fixed
+        triggerable name and trigger.
+
 2010-11-01  Mario Sanchez Prada  <msanchez at igalia.com>
 
         Unreviewed. Adding my IRC nickname to the list of committers.

-- 
WebKit Debian packaging