[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[sfalken at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 64f36c0a3ac86fdff087031621e00bf90a47fb7c
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 21:32:44 2011 +0000

    2011-01-06  Steve Falkenburg  <sfalken at apple.com>
    
            Reviewed by Adam Roben.
    
            Windows bots need to archive/unarchive builds to/from configuration-specific directories
            https://bugs.webkit.org/show_bug.cgi?id=51996
    
            After the configuration directory change, we were archiving the incorrect directory for
            build product, so we were running tests on the wrong binaries.
    
            This change archives the correct directory, and also unarchives it into a configuration-
            specific directory.
    
            * BuildSlaveSupport/build.webkit.org-config/master.cfg: Use a configuration-specific directory on Windows.
            * BuildSlaveSupport/built-product-archive: Unarchive/archive to/from proper directory.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75192 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 1c29d09..8cab123 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -201,8 +201,12 @@ class RunWebKitTests(shell.Test):
 
     def start(self):
         appendCustomBuildFlags(self, self.getProperty('platform'))
+        if platform == "win":
+            rootArgument = ['--root='] + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")
+        else:
+            rootArgument = ['--root=WebKitBuild/bin']
         if self.skipBuild:
-            self.setCommand(self.command + ['--root=WebKitBuild/bin'])
+            self.setCommand(self.command + rootArgument)
         return shell.Test.start(self)
 
     def commandComplete(self, cmd):
diff --git a/Tools/BuildSlaveSupport/built-product-archive b/Tools/BuildSlaveSupport/built-product-archive
index 1ccbdec..611d006 100644
--- a/Tools/BuildSlaveSupport/built-product-archive
+++ b/Tools/BuildSlaveSupport/built-product-archive
@@ -58,12 +58,13 @@ def archiveBuiltProduct(configuration, platform):
         if e.errno != 2:
             raise
 
+    configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
+
     if platform == 'mac':
-        configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
         return subprocess.call(["ditto", "-c", "-k", "--keepParent", "--sequesterRsrc", configurationBuildDirectory, archiveFile])
     elif platform == 'win':
-        binDirectory = os.path.join(buildDirectory, "bin")
-        thinDirectory = os.path.join(buildDirectory, "thin")
+        binDirectory = os.path.join(configurationBuildDirectory, "bin")
+        thinDirectory = os.path.join(configurationBuildDirectory, "thin")
         thinBinDirectory = os.path.join(thinDirectory, "bin")
 
         if os.path.isdir(thinDirectory):
@@ -82,7 +83,6 @@ def archiveBuiltProduct(configuration, platform):
         shutil.rmtree(thinDirectory)
 
     elif platform == 'qt':
-        configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
         thinDirectory = os.path.join(configurationBuildDirectory, "thin")
 
         if os.path.isdir(thinDirectory):
@@ -108,10 +108,9 @@ def extractBuiltProduct(configuration, platform):
     assert platform in ('mac', 'win','qt')
 
     archiveFile = os.path.join(buildDirectory, configuration + ".zip")
+    configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
 
     if platform == 'mac':
-        configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
-
         if os.path.isdir(configurationBuildDirectory):
             shutil.rmtree(configurationBuildDirectory)
 
@@ -120,11 +119,11 @@ def extractBuiltProduct(configuration, platform):
         os.unlink(archiveFile)
 
     elif platform == 'win':
-        binDirectory = os.path.join(buildDirectory, "bin")
+        binDirectory = os.path.join(configurationBuildDirectory, "bin")        
         if os.path.isdir(binDirectory):
             shutil.rmtree(binDirectory)
 
-        os.mkdir(binDirectory)
+        os.makedirs(binDirectory)
 
         safariPath = subprocess.Popen('cygpath -w "$PROGRAMFILES"/Safari',
                                       shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
@@ -132,12 +131,10 @@ def extractBuiltProduct(configuration, platform):
         if subprocess.call('cp -R "%s"/*.dll "%s"/*.resources %s' % (safariPath, safariPath, binDirectory), shell=True):
             return 1
 
-        if subprocess.call(["unzip", "-o", archiveFile], cwd=buildDirectory):
+        if subprocess.call(["unzip", "-o", archiveFile], cwd=configurationBuildDirectory):
             return 1
 
     elif platform == 'qt':
-        configurationBuildDirectory = os.path.join(buildDirectory, configuration.title())
-
         if os.path.isdir(configurationBuildDirectory):
             shutil.rmtree(configurationBuildDirectory)
 
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 7577432..532b806 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-06  Steve Falkenburg  <sfalken at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Windows bots need to archive/unarchive builds to/from configuration-specific directories
+        https://bugs.webkit.org/show_bug.cgi?id=51996
+        
+        After the configuration directory change, we were archiving the incorrect directory for
+        build product, so we were running tests on the wrong binaries.
+        
+        This change archives the correct directory, and also unarchives it into a configuration-
+        specific directory.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg: Use a configuration-specific directory on Windows.
+        * BuildSlaveSupport/built-product-archive: Unarchive/archive to/from proper directory.
+
 2011-01-06  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Mihai Parparita.

-- 
WebKit Debian packaging