| 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 import glob | 5 import glob |
| 6 import logging | 6 import logging |
| 7 import os | 7 import os |
| 8 import sys | 8 import sys |
| 9 | 9 |
| 10 from pylib import android_commands | 10 from pylib import android_commands |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 self.in_webkit_checkout = in_webkit_checkout | 157 self.in_webkit_checkout = in_webkit_checkout |
| 158 | 158 |
| 159 logging.warning('Test suite: ' + test_suite) | 159 logging.warning('Test suite: ' + test_suite) |
| 160 if os.path.splitext(test_suite)[1] == '.apk': | 160 if os.path.splitext(test_suite)[1] == '.apk': |
| 161 self.test_package = TestPackageApk( | 161 self.test_package = TestPackageApk( |
| 162 self.adb, | 162 self.adb, |
| 163 device, | 163 device, |
| 164 test_suite, | 164 test_suite, |
| 165 timeout, | 165 timeout, |
| 166 cleanup_test_files, | 166 cleanup_test_files, |
| 167 self.tool) | 167 self.tool, |
| 168 'org.chromium.native_test', |
| 169 'org.chromium.native_test.ChromeNativeTestActivity', |
| 170 'chrome-native-tests-command-line') |
| 168 else: | 171 else: |
| 169 # Put a copy into the android out/target directory, to allow stack trace | 172 # Put a copy into the android out/target directory, to allow stack trace |
| 170 # generation. | 173 # generation. |
| 171 symbols_dir = os.path.join(constants.CHROME_DIR, 'out', build_type, | 174 symbols_dir = os.path.join(constants.CHROME_DIR, 'out', build_type, |
| 172 'lib.target') | 175 'lib.target') |
| 173 self.test_package = TestPackageExecutable( | 176 self.test_package = TestPackageExecutable( |
| 174 self.adb, | 177 self.adb, |
| 175 device, | 178 device, |
| 176 test_suite, timeout, | 179 test_suite, timeout, |
| 177 cleanup_test_files, | 180 cleanup_test_files, |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 self.StripAndCopyFiles() | 277 self.StripAndCopyFiles() |
| 275 self.LaunchHelperToolsForTestSuite() | 278 self.LaunchHelperToolsForTestSuite() |
| 276 self.tool.SetupEnvironment() | 279 self.tool.SetupEnvironment() |
| 277 | 280 |
| 278 def TearDown(self): | 281 def TearDown(self): |
| 279 """Cleans up the test enviroment for the test suite.""" | 282 """Cleans up the test enviroment for the test suite.""" |
| 280 self.tool.CleanUpEnvironment() | 283 self.tool.CleanUpEnvironment() |
| 281 if self.test_package.cleanup_test_files: | 284 if self.test_package.cleanup_test_files: |
| 282 self.adb.RemovePushedFiles() | 285 self.adb.RemovePushedFiles() |
| 283 super(TestRunner, self).TearDown() | 286 super(TestRunner, self).TearDown() |
| OLD | NEW |