Changeset 64959 in webkit

Timestamp:

Aug 8, 2010 6:26:16 PM (14 years ago)

Author:

tkent@chromium.org

Message:

Chromium buildbot: Avoid "zip" command dependency
​https://bugs.webkit.org/show_bug.cgi?id=43470

Reviewed by Tony Chang.

• BuildSlaveSupport/test-result-archive: For Chromium port, creates a zip archive with zipfile package of Python instead of external "zip" command. We'd like to avoid additional command installation.

Location:

trunk/WebKitTools

Files:

• BuildSlaveSupport/test-result-archive (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKitTools/BuildSlaveSupport/test-result-archive

@@ -24 +24 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import optparse, os, shutil, subprocess, sys
+import optparse, os, shutil, subprocess, sys, zipfile
 
 sourceRootDirectory = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
@@ -73 +73 @@
         if subprocess.call(["ditto", "-c", "-k", "--sequesterRsrc", layoutTestResultsDir, archiveFile]):
             return 1
-    elif platform in ('win', 'gtk', 'qt', 'chromium'):
+    elif platform in ('win', 'gtk', 'qt'):
         if subprocess.call(["zip", "-r", archiveFile, "."], cwd=layoutTestResultsDir):
             return 1
+    elif platform == 'chromium':
+        os.chdir(layoutTestResultsDir)
+        zipFilesRecursively(archiveFile, ["."])
 
     try:
@@ -89 +92 @@
             raise
 
+def zipFilesRecursively(archiveFile, files):
+    """Make a zip archive.
+
+    Args:
+        archiveFile: The resultant zip archive file name.
+        files: A list of files to be archived.  If a list item is a directory,
+            files in the directory are archived recursively."""
+    zipper = zipfile.ZipFile(archiveFile, 'w', zipfile.ZIP_DEFLATED)
+    for file in files:
+        if os.path.isdir(file):
+            for dirPath, dirNames, fileNames in os.walk(file):
+                for fileName in fileNames:
+                    relativePath = os.path.join(dirPath, fileName)
+                    print "Adding", relativePath
+                    zipper.write(relativePath)
+        else:
+            print "Adding", file
+            zipper.write(file)
+    zipper.close()
+    print "Created zip archive: ", archiveFile
+
 if __name__ == '__main__':
     sys.exit(main())

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-08  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Chromium buildbot: Avoid "zip" command dependency
+        https://bugs.webkit.org/show_bug.cgi?id=43470
+
+        * BuildSlaveSupport/test-result-archive:
+         For Chromium port, creates a zip archive with zipfile package of Python
+         instead of external "zip" command. We'd like to avoid additional
+         command installation.
+
 2010-08-08  Jon Honeycutt  <jhoneycutt@apple.com>