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 TestPackageApk to help run APK-based native tests.""" | 5 """Defines TestPackageApk to help run APK-based native tests.""" |
6 # pylint: disable=W0212 | 6 # pylint: disable=W0212 |
7 | 7 |
8 import itertools | 8 import itertools |
9 import logging | 9 import logging |
10 import os | 10 import os |
(...skipping 26 matching lines...) Expand all Loading... |
37 constants.GetOutDirectory(), '%s_apk' % suite_name, | 37 constants.GetOutDirectory(), '%s_apk' % suite_name, |
38 '%s-debug.apk' % suite_name) | 38 '%s-debug.apk' % suite_name) |
39 if suite_name == 'content_browsertests': | 39 if suite_name == 'content_browsertests': |
40 self._package_info = constants.PACKAGE_INFO['content_browsertests'] | 40 self._package_info = constants.PACKAGE_INFO['content_browsertests'] |
41 elif suite_name == 'components_browsertests': | 41 elif suite_name == 'components_browsertests': |
42 self._package_info = constants.PACKAGE_INFO['components_browsertests'] | 42 self._package_info = constants.PACKAGE_INFO['components_browsertests'] |
43 else: | 43 else: |
44 self._package_info = constants.PACKAGE_INFO['gtest'] | 44 self._package_info = constants.PACKAGE_INFO['gtest'] |
45 | 45 |
46 if suite_name == 'net_unittests': | 46 if suite_name == 'net_unittests': |
47 self._extras = {'RunInSubThread': ''} | 47 self._extras = {'RunInSubThread': None} |
48 else: | 48 else: |
49 self._extras = [] | 49 self._extras = [] |
50 | 50 |
51 def _CreateCommandLineFileOnDevice(self, device, options): | 51 def _CreateCommandLineFileOnDevice(self, device, options): |
52 device.WriteFile(self._package_info.cmdline_file, | 52 device.WriteFile(self._package_info.cmdline_file, |
53 self.suite_name + ' ' + options) | 53 self.suite_name + ' ' + options) |
54 | 54 |
55 def _GetFifo(self): | 55 def _GetFifo(self): |
56 # The test.fifo path is determined by: | 56 # The test.fifo path is determined by: |
57 # testing/android/native_test/java/src/org/chromium/native_test/ | 57 # testing/android/native_test/java/src/org/chromium/native_test/ |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 | 148 |
149 #override | 149 #override |
150 def Install(self, device): | 150 def Install(self, device): |
151 self.tool.CopyFiles(device) | 151 self.tool.CopyFiles(device) |
152 device.Install(self.suite_path) | 152 device.Install(self.suite_path) |
153 | 153 |
154 #override | 154 #override |
155 def PullAppFiles(self, device, files, directory): | 155 def PullAppFiles(self, device, files, directory): |
156 local_device_gtest_run.PullAppFilesImpl( | 156 local_device_gtest_run.PullAppFilesImpl( |
157 device, self._package_info.package, files, directory) | 157 device, self._package_info.package, files, directory) |
OLD | NEW |