Backed out changeset 133471646752 (bug 1055014) for causing intermittent B2G xpcshell failures.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-08-19 13:30:55 -04:00
parent 87e9390e0a
commit c07a8c7882

View File

@ -53,6 +53,18 @@ class B2GXPCShellRemote(XPCShellRemote):
print >>sys.stderr, "\nCleaning files from previous run.." print >>sys.stderr, "\nCleaning files from previous run.."
self.device.removeDir(self.options.remoteTestRoot) self.device.removeDir(self.options.remoteTestRoot)
# Overriden
def setupTestDir(self):
if self.device._useZip:
return XPCShellRemote.setupTestDir(self)
for root, dirs, files in os.walk(self.xpcDir):
for filename in files:
rel_path = os.path.relpath(os.path.join(root, filename), self.xpcDir)
test_file = os.path.join(self.remoteScriptsDir, rel_path)
print 'pushing %s' % test_file
self.device.pushFile(os.path.join(root, filename), test_file, retryLimit=10)
# Overridden # Overridden
def pushLibs(self): def pushLibs(self):
if not self.options.use_device_libs: if not self.options.use_device_libs: