OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 re | 5 import re |
6 import string | 6 import string |
7 | 7 |
8 | 8 |
9 class Test(object): | 9 class Test(object): |
10 """ | 10 """ |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 return True # pragma: no cover | 266 return True # pragma: no cover |
267 | 267 |
268 def isolate_target(self, _api): | 268 def isolate_target(self, _api): |
269 return self.target_name # pragma: no cover | 269 return self.target_name # pragma: no cover |
270 | 270 |
271 def compile_targets(self, api): | 271 def compile_targets(self, api): |
272 if self._override_compile_targets: | 272 if self._override_compile_targets: |
273 return self._override_compile_targets | 273 return self._override_compile_targets |
274 | 274 |
275 if api.chromium.c.TARGET_PLATFORM == 'android': | 275 if api.chromium.c.TARGET_PLATFORM == 'android': |
| 276 # TODO(agrieve): Remove _apk suffix in favour of bin/run_${target} once |
| 277 # GYP is gone. http://crbug.com/599919 |
276 return [self.target_name + '_apk'] | 278 return [self.target_name + '_apk'] |
277 | 279 |
278 return [self.target_name] | 280 return [self.target_name] |
279 | 281 |
280 def run(self, api, suffix, test_filter=None): | 282 def run(self, api, suffix, test_filter=None): |
281 # Copy the list because run can be invoked multiple times and we modify | 283 # Copy the list because run can be invoked multiple times and we modify |
282 # the local copy. | 284 # the local copy. |
283 args = self._args[:] | 285 args = self._args[:] |
284 is_android = api.chromium.c.TARGET_PLATFORM == 'android' | 286 is_android = api.chromium.c.TARGET_PLATFORM == 'android' |
285 | 287 |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
817 return self._override_compile_targets | 819 return self._override_compile_targets |
818 | 820 |
819 if api.chromium.c.TARGET_PLATFORM == 'android': | 821 if api.chromium.c.TARGET_PLATFORM == 'android': |
820 # Not all _apk_runs have a corresponding _apk, so we only return the | 822 # Not all _apk_runs have a corresponding _apk, so we only return the |
821 # _apk_run here. | 823 # _apk_run here. |
822 return [self.target_name + '_apk_run'] | 824 return [self.target_name + '_apk_run'] |
823 | 825 |
824 return [self.target_name, self.target_name + '_run'] | 826 return [self.target_name, self.target_name + '_run'] |
825 | 827 |
826 def isolate_target(self, api): | 828 def isolate_target(self, api): |
| 829 # TODO(agrieve): Remove _apk suffix in favour of bin/run_${target} once |
| 830 # GYP is gone. http://crbug.com/599919 |
827 if api.chromium.c.TARGET_PLATFORM == 'android': | 831 if api.chromium.c.TARGET_PLATFORM == 'android': |
828 return self.target_name + '_apk' | 832 return self.target_name + '_apk' |
829 return self.target_name | 833 return self.target_name |
830 | 834 |
831 def create_task(self, api, suffix, isolated_hash, test_filter=None): | 835 def create_task(self, api, suffix, isolated_hash, test_filter=None): |
832 # For local tests test_args are added inside api.chromium.runtest. | 836 # For local tests test_args are added inside api.chromium.runtest. |
833 args = self._args[:] | 837 args = self._args[:] |
834 args.extend(api.chromium.c.runtests.test_args) | 838 args.extend(api.chromium.c.runtests.test_args) |
835 | 839 |
836 if suffix == 'without patch': | 840 if suffix == 'without patch': |
(...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1858 def run(self, api, suffix, test_filter=None): | 1862 def run(self, api, suffix, test_filter=None): |
1859 api.chromium_android.coverage_report(upload=False) | 1863 api.chromium_android.coverage_report(upload=False) |
1860 api.chromium_android.get_changed_lines_for_revision() | 1864 api.chromium_android.get_changed_lines_for_revision() |
1861 api.chromium_android.incremental_coverage_report() | 1865 api.chromium_android.incremental_coverage_report() |
1862 | 1866 |
1863 | 1867 |
1864 GOMA_TESTS = [ | 1868 GOMA_TESTS = [ |
1865 GTestTest('base_unittests'), | 1869 GTestTest('base_unittests'), |
1866 GTestTest('content_unittests'), | 1870 GTestTest('content_unittests'), |
1867 ] | 1871 ] |
OLD | NEW |