Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Side by Side Diff: build/android/pylib/linker/test_runner.py

Issue 1049993003: Revert of [Android] Clean up old_interface in build/android/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/android/pylib/linker/setup.py ('k') | build/android/pylib/perf/perf_control.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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): 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 cleanup_test_files: Whether or not to cleanup test files on device.
58 """ 59 """
59 super(LinkerTestRunner, self).__init__(device, tool) 60
61 super(LinkerTestRunner, self).__init__(device, tool, cleanup_test_files)
60 62
61 #override 63 #override
62 def InstallTestPackage(self): 64 def InstallTestPackage(self):
63 apk_path = os.path.join( 65 apk_path = os.path.join(
64 constants.GetOutDirectory(), 'apks', '%s.apk' % _PACKAGE_NAME) 66 constants.GetOutDirectory(), 'apks', '%s.apk' % _PACKAGE_NAME)
65 67
66 if not os.path.exists(apk_path): 68 if not os.path.exists(apk_path):
67 raise Exception('%s not found, please build it' % apk_path) 69 raise Exception('%s not found, please build it' % apk_path)
68 70
69 self.device.Install(apk_path) 71 package_name = apk_helper.GetPackageName(apk_path)
72 self.device.old_interface.ManagedInstall(apk_path, package_name)
70 73
71 #override 74 #override
72 def RunTest(self, test): 75 def RunTest(self, test):
73 """Sets up and runs a test case. 76 """Sets up and runs a test case.
74 77
75 Args: 78 Args:
76 test: An object which is ostensibly a subclass of LinkerTestCaseBase. 79 test: An object which is ostensibly a subclass of LinkerTestCaseBase.
77 80
78 Returns: 81 Returns:
79 A TestRunResults object which contains the result produced by the test 82 A TestRunResults object which contains the result produced by the test
80 and, in the case of a failure, the test that should be retried. 83 and, in the case of a failure, the test that should be retried.
81 """ 84 """
82 85
83 assert isinstance(test, test_case.LinkerTestCaseBase) 86 assert isinstance(test, test_case.LinkerTestCaseBase)
84 87
85 try: 88 try:
86 results = test.Run(self.device) 89 results = test.Run(self.device)
87 except Exception: 90 except Exception:
88 logging.exception('Caught exception while trying to run test: ' + 91 logging.exception('Caught exception while trying to run test: ' +
89 test.tagged_name) 92 test.tagged_name)
90 exc_info = sys.exc_info() 93 exc_info = sys.exc_info()
91 results = base_test_result.TestRunResults() 94 results = base_test_result.TestRunResults()
92 results.AddResult(LinkerExceptionTestResult( 95 results.AddResult(LinkerExceptionTestResult(
93 test.tagged_name, exc_info)) 96 test.tagged_name, exc_info))
94 97
95 if not results.DidRunPass(): 98 if not results.DidRunPass():
96 return results, test 99 return results, test
97 else: 100 else:
98 return results, None 101 return results, None
OLDNEW
« no previous file with comments | « build/android/pylib/linker/setup.py ('k') | build/android/pylib/perf/perf_control.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698