Backout 7d0cd546fb77. r=bustage

--HG-- branch : production-0.8
mozilla-releng · May 31, 2012 · 40c4ed7 · 40c4ed7
1 parent 59add14
commit 40c4ed7
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/steps/misc.py b/steps/misc.py
@@ -580,25 +580,21 @@ def start(self):
         filename = self.build.getProperties().render(self.filename)
         self.filename = filename
         if filename.endswith(".zip"):
-            args = ['unzip', '-o', filename, 'bin*', 'certs*', 'modules*']
-
             # modify the commands to extract only the files we need - the test directory and bin/ and certs/
             if self.testtype == "mochitest":
-                args.append('mochitest*')
+                self.setCommand(['unzip', '-o', filename, 'bin*', 'certs*', 'mochitest*'])
             elif self.testtype == "xpcshell":
-                args.append('xpcshell*')
+                self.setCommand(['unzip', '-o', filename, 'bin*', 'certs*', 'xpcshell*'])
             elif self.testtype == "jsreftest":
                 # jsreftest needs both jsreftest/ and reftest/ in addition to bin/ and certs/
-                args.extend(['jsreftest*', 'reftest*'])
+                self.setCommand(['unzip', '-o', filename, 'bin*', 'certs*', 'jsreftest*', 'reftest*'])
             elif self.testtype == "reftest":
-                args.append('reftest*')
+                self.setCommand(['unzip', '-o', filename, 'bin*', 'certs*', 'reftest*'])
             elif self.testtype == "jetpack":
-                args.append('jetpack*')
+                self.setCommand(['unzip', '-o', filename, 'bin*', 'certs*', 'jetpack*'])
             else:
                 # If it all fails, we extract the whole shebang
-                args = ['unzip', '-o', filename]
+                self.setCommand(['unzip', '-o', filename])
-
-            self.setCommand(args)
         #If we come across a test not packaged as a zip file, try unpacking the whole thing using tar+gzip/bzip2
         elif filename.endswith("tar.bz2"):
             self.setCommand(['tar', '-jxvf', filename])