[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 bcc8c70ce286318e12ffe45d230f6e57b5211756
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 22:37:15 2010 +0000

    Make each Windows Test builder use the same OS for all its slaves
    
    Currently each WebKit1 Windows Test builder has one Windows XP slave
    and one Windows 7 slave. Having different OSes in a single builder
    meant that the builders would alternate between red and green when
    there were OS-specific failures.
    
    Fixes <http://webkit.org/b/49688> Windows Test builders alternate
    between red and green because of multiple OS versions
    
    Reviewed by Mark Rowe.
    
    * BuildSlaveSupport/build.webkit.org-config/config.json: Renamed
    "Windows Release (Tests)" to "Windows 7 Release (Tests)", "Windows
    Debug (Tests)" to "Windows XP Debug (Tests)", and "Windows Release
    (WebKit2 Tests)" to "Windows 7 Release (WebKit2 Tests)". Updated the
    builders for the two WebKit1 builders so that they would all use the
    appropriate OS.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72245 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 0253693..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"]
                     },
@@ -237,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/ChangeLog b/WebKitTools/ChangeLog
index e57acf4..e244f79 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,24 @@
+2010-11-17  Adam Roben  <aroben at apple.com>
+
+        Make each Windows Test builder use the same OS for all its slaves
+
+        Currently each WebKit1 Windows Test builder has one Windows XP slave
+        and one Windows 7 slave. Having different OSes in a single builder
+        meant that the builders would alternate between red and green when
+        there were OS-specific failures.
+
+        Fixes <http://webkit.org/b/49688> Windows Test builders alternate
+        between red and green because of multiple OS versions
+
+        Reviewed by Mark Rowe.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json: Renamed
+        "Windows Release (Tests)" to "Windows 7 Release (Tests)", "Windows
+        Debug (Tests)" to "Windows XP Debug (Tests)", and "Windows Release
+        (WebKit2 Tests)" to "Windows 7 Release (WebKit2 Tests)". Updated the
+        builders for the two WebKit1 builders so that they would all use the
+        appropriate OS.
+
 2010-11-17  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Dan Bernstein.

-- 
WebKit Debian packaging