Index: build/android/pylib/gtest/test_package_exe.py |
diff --git a/build/android/pylib/gtest/test_package_exe.py b/build/android/pylib/gtest/test_package_exe.py |
index e607cad512aa90d06b7b60e698484f36fa634b0d..ee95b5c459668e9d840c21bd9bcab540cf956e5b 100644 |
--- a/build/android/pylib/gtest/test_package_exe.py |
+++ b/build/android/pylib/gtest/test_package_exe.py |
@@ -6,6 +6,7 @@ |
import logging |
import os |
+import posixpath |
import sys |
import tempfile |
@@ -119,14 +120,19 @@ class TestPackageExecutable(TestPackage): |
#override |
def GetAllTests(self, device): |
- cmd = '%s %s/%s --gtest_list_tests' % (self.tool.GetTestWrapper(), |
- constants.TEST_EXECUTABLE_DIR, self.suite_name) |
- lib_path = '%s/%s_deps' % (constants.TEST_EXECUTABLE_DIR, self.suite_name) |
- (exit_code, output) = device.old_interface.GetAndroidToolStatusAndOutput( |
- cmd, lib_path=lib_path) |
- if exit_code != 0: |
- raise Exception( |
- 'Failed to start binary:\n%s' % '\n'.join(output)) |
+ lib_path = posixpath.join( |
+ constants.TEST_EXECUTABLE_DIR, '%s_deps' % self.suite_name) |
+ |
+ cmd = [] |
+ for wrapper in (device.GetDevicePieWrapper(), self.tool.GetTestWrapper()): |
+ if wrapper: |
+ cmd.append(wrapper) |
+ cmd.extend([ |
+ posixpath.join(constants.TEST_EXECUTABLE_DIR, self.suite_name), |
+ '--gtest_list_tests']) |
+ |
+ output = device.RunShellCommand( |
+ cmd, check_return=True, env={'LD_LIBRARY_PATH': lib_path}) |
return gtest_test_instance.ParseGTestListTests(output) |
#override |