| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 """Runs linker tests on a particular device.""" | 5 """Runs linker tests on a particular device.""" |
| 6 | 6 |
| 7 import logging | 7 import logging |
| 8 import os.path | 8 import os.path |
| 9 import sys | 9 import sys |
| 10 import traceback | 10 import traceback |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 | 42 |
| 43 | 43 |
| 44 class LinkerTestRunner(base_test_runner.BaseTestRunner): | 44 class LinkerTestRunner(base_test_runner.BaseTestRunner): |
| 45 """Orchestrates running a set of linker tests. | 45 """Orchestrates running a set of linker tests. |
| 46 | 46 |
| 47 Any Python exceptions in the tests are caught and translated into a failed | 47 Any Python exceptions in the tests are caught and translated into a failed |
| 48 result, rather than being re-raised on the main thread. | 48 result, rather than being re-raised on the main thread. |
| 49 """ | 49 """ |
| 50 | 50 |
| 51 #override | 51 #override |
| 52 def __init__(self, device, tool, push_deps, cleanup_test_files): | 52 def __init__(self, device, tool, cleanup_test_files): |
| 53 """Creates a new LinkerTestRunner. | 53 """Creates a new LinkerTestRunner. |
| 54 | 54 |
| 55 Args: | 55 Args: |
| 56 device: Attached android device. | 56 device: Attached android device. |
| 57 tool: Name of the Valgrind tool. | 57 tool: Name of the Valgrind tool. |
| 58 push_deps: If True, push all dependencies to the device. | |
| 59 cleanup_test_files: Whether or not to cleanup test files on device. | 58 cleanup_test_files: Whether or not to cleanup test files on device. |
| 60 """ | 59 """ |
| 61 | 60 |
| 62 super(LinkerTestRunner, self).__init__(device, tool, push_deps, | 61 super(LinkerTestRunner, self).__init__(device, tool, cleanup_test_files) |
| 63 cleanup_test_files) | |
| 64 | 62 |
| 65 #override | 63 #override |
| 66 def InstallTestPackage(self): | 64 def InstallTestPackage(self): |
| 67 apk_path = os.path.join( | 65 apk_path = os.path.join( |
| 68 constants.GetOutDirectory(), 'apks', '%s.apk' % _PACKAGE_NAME) | 66 constants.GetOutDirectory(), 'apks', '%s.apk' % _PACKAGE_NAME) |
| 69 | 67 |
| 70 if not os.path.exists(apk_path): | 68 if not os.path.exists(apk_path): |
| 71 raise Exception('%s not found, please build it' % apk_path) | 69 raise Exception('%s not found, please build it' % apk_path) |
| 72 | 70 |
| 73 package_name = apk_helper.GetPackageName(apk_path) | 71 package_name = apk_helper.GetPackageName(apk_path) |
| (...skipping 20 matching lines...) Expand all Loading... |
| 94 test.tagged_name) | 92 test.tagged_name) |
| 95 exc_info = sys.exc_info() | 93 exc_info = sys.exc_info() |
| 96 results = base_test_result.TestRunResults() | 94 results = base_test_result.TestRunResults() |
| 97 results.AddResult(LinkerExceptionTestResult( | 95 results.AddResult(LinkerExceptionTestResult( |
| 98 test.tagged_name, exc_info)) | 96 test.tagged_name, exc_info)) |
| 99 | 97 |
| 100 if not results.DidRunPass(): | 98 if not results.DidRunPass(): |
| 101 return results, test | 99 return results, test |
| 102 else: | 100 else: |
| 103 return results, None | 101 return results, None |
| OLD | NEW |