Backed out changeset 133471646752 (bug 1055014) for causing intermittent B2G xpcshell failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 19 Aug 2014 13:30:55 -0400
changeset 200399 39830d7054c6b3d79d13e1b337c4bd50987be9ee
parent 200398 17aad6ca3989b8e4b314028291593407b8c2fba1
child 200400 149d3ce6e0206dc5660d7ad494fc7fde3521ad5a
child 200426 6b5285b794baafa5819921930cbd22c3a3e0a8b2
push id27342
push userryanvm@gmail.com
push dateTue, 19 Aug 2014 20:23:11 +0000
treeherdermozilla-central@149d3ce6e020 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1055014
milestone34.0a1
backs out1334716467528d9751559a72b61ff1a0029bf1f7
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 133471646752 (bug 1055014) for causing intermittent B2G xpcshell failures. CLOSED TREE
testing/xpcshell/runtestsb2g.py
--- a/testing/xpcshell/runtestsb2g.py
+++ b/testing/xpcshell/runtestsb2g.py
@@ -48,16 +48,28 @@ class B2GXPCShellRemote(XPCShellRemote):
             self.device.mkDir(self.options.remoteTestRoot)
 
         XPCShellRemote.setupUtilities(self)
 
     def clean(self):
         print >>sys.stderr, "\nCleaning files from previous run.."
         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
     def pushLibs(self):
         if not self.options.use_device_libs:
             count = XPCShellRemote.pushLibs(self)
             if not count:
                 # couldn't find any libs, fallback to device libs
                 self.env['LD_LIBRARY_PATH'] = '/system/b2g'
                 self.options.use_device_libs = True