Chromium Code Reviews| 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..393b6a7f456f92e43aa23121702e315dec7057d6 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,13 @@ 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) |
|
perezju
2015/03/30 16:01:17
nit: maybe should also use posixpath.join?
jbudorick
2015/03/30 16:42:14
Done.
|
| - (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)) |
| + output = device.RunShellCommand( |
| + [device.GetDevicePieWrapper(), self.tool.GetTestWrapper(), |
|
perezju
2015/03/30 16:01:16
only pass wrappers if needed.
jbudorick
2015/03/30 16:42:14
Done.
|
| + posixpath.join(constants.TEST_EXECUTABLE_DIR, self.suite_name), |
| + '--gtest_list_tests'], |
| + check_return=True, |
| + env={'LD_LIBRARY_PATH': lib_path}) |
| return gtest_test_instance.ParseGTestListTests(output) |
| #override |