OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """Defines TestPackageExecutable to help run stand-alone executables.""" | 5 """Defines TestPackageExecutable to help run stand-alone executables.""" |
6 | 6 |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import posixpath | 9 import posixpath |
10 import sys | 10 import sys |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 cmd.append(self.tool.GetTestWrapper()) | 120 cmd.append(self.tool.GetTestWrapper()) |
121 cmd.extend([ | 121 cmd.extend([ |
122 posixpath.join(constants.TEST_EXECUTABLE_DIR, self.suite_name), | 122 posixpath.join(constants.TEST_EXECUTABLE_DIR, self.suite_name), |
123 '--gtest_list_tests']) | 123 '--gtest_list_tests']) |
124 | 124 |
125 output = device.RunShellCommand( | 125 output = device.RunShellCommand( |
126 cmd, check_return=True, env={'LD_LIBRARY_PATH': lib_path}) | 126 cmd, check_return=True, env={'LD_LIBRARY_PATH': lib_path}) |
127 return gtest_test_instance.ParseGTestListTests(output) | 127 return gtest_test_instance.ParseGTestListTests(output) |
128 | 128 |
129 #override | 129 #override |
130 def SpawnTestProcess(self, device): | 130 def SpawnTestProcess(self, device, tests_run_in_subthread=False): |
| 131 if tests_run_in_subthread: |
| 132 raise NotImplementedError( |
| 133 'tests_run_in_subthread not supported for executables') |
131 args = ['adb', '-s', str(device), 'shell', 'sh', | 134 args = ['adb', '-s', str(device), 'shell', 'sh', |
132 constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh'] | 135 constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh'] |
133 logging.info(args) | 136 logging.info(args) |
134 return pexpect.spawn(args[0], args[1:], logfile=sys.stdout) | 137 return pexpect.spawn(args[0], args[1:], logfile=sys.stdout) |
135 | 138 |
136 #override | 139 #override |
137 def Install(self, device): | 140 def Install(self, device): |
138 if self.tool.NeedsDebugInfo(): | 141 if self.tool.NeedsDebugInfo(): |
139 target_name = self.suite_path | 142 target_name = self.suite_path |
140 else: | 143 else: |
(...skipping 13 matching lines...) Expand all Loading... |
154 | 157 |
155 test_binary_path = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name | 158 test_binary_path = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name |
156 device.PushChangedFiles([(target_name, test_binary_path)]) | 159 device.PushChangedFiles([(target_name, test_binary_path)]) |
157 deps_path = self.suite_path + '_deps' | 160 deps_path = self.suite_path + '_deps' |
158 if os.path.isdir(deps_path): | 161 if os.path.isdir(deps_path): |
159 device.PushChangedFiles([(deps_path, test_binary_path + '_deps')]) | 162 device.PushChangedFiles([(deps_path, test_binary_path + '_deps')]) |
160 | 163 |
161 #override | 164 #override |
162 def PullAppFiles(self, device, files, directory): | 165 def PullAppFiles(self, device, files, directory): |
163 pass | 166 pass |
OLD | NEW |