Permalink
Browse files

Backout 7d0cd546fb77 r=bustage

  • Loading branch information...
1 parent c479a36 commit ca38ff41f3ea998f4ef9710b59dab8bb80440f28 @catlee catlee committed May 31, 2012
Showing with 6 additions and 10 deletions.
  1. +6 −10 steps/misc.py
View
@@ -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(args)
+ self.setCommand(['unzip', '-o', filename])
#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])

0 comments on commit ca38ff4

Please sign in to comment.