Bug 1202101 - In Android cppunit tests, push assets libs; r=dminor
authorGeoff Brown <gbrown@mozilla.com>
Wed, 09 Sep 2015 07:12:57 -0600
changeset 261587 f0449939f79ed8ed95dca7f681a0fc04bc6c4e81
parent 261586 46f3675eec80eee3b85da28ec4996900e601849c
child 261588 6422d6fcc6ae4541c4bb7b560dcd341f2580c4c9
push id15105
push userkwierso@gmail.com
push dateWed, 09 Sep 2015 20:53:22 +0000
treeherderfx-team@dd2a1d737a64 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdminor
bugs1202101
milestone43.0a1
Bug 1202101 - In Android cppunit tests, push assets libs; r=dminor
testing/remotecppunittests.py
--- a/testing/remotecppunittests.py
+++ b/testing/remotecppunittests.py
@@ -77,23 +77,24 @@ class RemoteCPPUnitTests(cppunittests.CP
 
         elif self.options.local_lib:
             for file in os.listdir(self.options.local_lib):
                 if file.endswith(".so"):
                     print >> sys.stderr, "Pushing %s.." % file
                     remote_file = posixpath.join(self.remote_bin_dir, file)
                     self.device.pushFile(os.path.join(self.options.local_lib, file), remote_file)
             # Additional libraries may be found in a sub-directory such as "lib/armeabi-v7a"
-            local_arm_lib = os.path.join(self.options.local_lib, "lib")
-            if os.path.isdir(local_arm_lib):
-                for root, dirs, files in os.walk(local_arm_lib):
-                    for file in files:
-                        if (file.endswith(".so")):
-                            remote_file = posixpath.join(self.remote_bin_dir, file)
-                            self.device.pushFile(os.path.join(root, file), remote_file)
+            for subdir in ["assets", "lib"]:
+                local_arm_lib = os.path.join(self.options.local_lib, subdir)
+                if os.path.isdir(local_arm_lib):
+                    for root, dirs, files in os.walk(local_arm_lib):
+                        for file in files:
+                            if (file.endswith(".so")):
+                                remote_file = posixpath.join(self.remote_bin_dir, file)
+                                self.device.pushFile(os.path.join(root, file), remote_file)
 
     def push_progs(self, progs):
         for local_file in progs:
             remote_file = posixpath.join(self.remote_bin_dir, os.path.basename(local_file))
             self.device.pushFile(local_file, remote_file)
 
     def build_environment(self):
         env = self.build_core_environment()