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 base_test_runner import BaseTestRunner | 10 from base_test_runner import BaseTestRunner |
(...skipping 30 matching lines...) Expand all Loading... | |
41 self._gtest_filter = gtest_filter | 41 self._gtest_filter = gtest_filter |
42 self._test_arguments = test_arguments | 42 self._test_arguments = test_arguments |
43 self.test_results = TestResults() | 43 self.test_results = TestResults() |
44 if dump_debug_info: | 44 if dump_debug_info: |
45 self.dump_debug_info = debug_info.GTestDebugInfo(self.adb, device, | 45 self.dump_debug_info = debug_info.GTestDebugInfo(self.adb, device, |
46 os.path.basename(test_suite), gtest_filter) | 46 os.path.basename(test_suite), gtest_filter) |
47 else: | 47 else: |
48 self.dump_debug_info = None | 48 self.dump_debug_info = None |
49 self.fast_and_loose = fast_and_loose | 49 self.fast_and_loose = fast_and_loose |
50 | 50 |
51 logging.warning('Test suite: ' + test_suite) | |
Xianzhu
2012/08/10 04:15:44
This is printed because I think it's important to
| |
51 if os.path.splitext(test_suite)[1] == '.apk': | 52 if os.path.splitext(test_suite)[1] == '.apk': |
52 self.test_package = TestPackageApk(self.adb, device, | 53 self.test_package = TestPackageApk(self.adb, device, |
53 test_suite, timeout, rebaseline, performance_test, cleanup_test_files, | 54 test_suite, timeout, rebaseline, performance_test, cleanup_test_files, |
54 self.tool, self.dump_debug_info) | 55 self.tool, self.dump_debug_info) |
55 else: | 56 else: |
56 self.test_package = TestPackageExecutable( | 57 self.test_package = TestPackageExecutable( |
57 self.adb, device, | 58 self.adb, device, |
58 test_suite, timeout, rebaseline, performance_test, cleanup_test_files, | 59 test_suite, timeout, rebaseline, performance_test, cleanup_test_files, |
59 self.tool, self.dump_debug_info) | 60 self.tool, self.dump_debug_info) |
60 | 61 |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
330 self.tool.CleanUpEnvironment() | 331 self.tool.CleanUpEnvironment() |
331 if self.test_package.cleanup_test_files: | 332 if self.test_package.cleanup_test_files: |
332 self.adb.RemovePushedFiles() | 333 self.adb.RemovePushedFiles() |
333 if self.dump_debug_info: | 334 if self.dump_debug_info: |
334 self.dump_debug_info.StopRecordingLog() | 335 self.dump_debug_info.StopRecordingLog() |
335 if self.test_package.performance_test: | 336 if self.test_package.performance_test: |
336 self.adb.TearDownPerformanceTest() | 337 self.adb.TearDownPerformanceTest() |
337 if self.dump_debug_info: | 338 if self.dump_debug_info: |
338 self.dump_debug_info.ArchiveNewCrashFiles() | 339 self.dump_debug_info.ArchiveNewCrashFiles() |
339 super(SingleTestRunner, self).TearDown() | 340 super(SingleTestRunner, self).TearDown() |
OLD | NEW |