| 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 the _apk entry once GYP is gone. | 276 return [self.target_name + '_apk'] |
| 277 return [self.target_name + '_apk', 'bin/run_%s' % self.target_name] | |
| 278 | 277 |
| 279 return [self.target_name] | 278 return [self.target_name] |
| 280 | 279 |
| 281 def run(self, api, suffix, test_filter=None): | 280 def run(self, api, suffix, test_filter=None): |
| 282 # Copy the list because run can be invoked multiple times and we modify | 281 # Copy the list because run can be invoked multiple times and we modify |
| 283 # the local copy. | 282 # the local copy. |
| 284 args = self._args[:] | 283 args = self._args[:] |
| 285 is_android = api.chromium.c.TARGET_PLATFORM == 'android' | 284 is_android = api.chromium.c.TARGET_PLATFORM == 'android' |
| 286 | 285 |
| 287 if suffix == 'without patch': | 286 if suffix == 'without patch': |
| (...skipping 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1859 def run(self, api, suffix, test_filter=None): | 1858 def run(self, api, suffix, test_filter=None): |
| 1860 api.chromium_android.coverage_report(upload=False) | 1859 api.chromium_android.coverage_report(upload=False) |
| 1861 api.chromium_android.get_changed_lines_for_revision() | 1860 api.chromium_android.get_changed_lines_for_revision() |
| 1862 api.chromium_android.incremental_coverage_report() | 1861 api.chromium_android.incremental_coverage_report() |
| 1863 | 1862 |
| 1864 | 1863 |
| 1865 GOMA_TESTS = [ | 1864 GOMA_TESTS = [ |
| 1866 GTestTest('base_unittests'), | 1865 GTestTest('base_unittests'), |
| 1867 GTestTest('content_unittests'), | 1866 GTestTest('content_unittests'), |
| 1868 ] | 1867 ] |
| OLD | NEW |