| 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 1595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1606 def __init__(self, name, compile_targets=None, apk_under_test=None, | 1606 def __init__(self, name, compile_targets=None, apk_under_test=None, |
| 1607 test_apk=None, isolate_file_path=None, timeout_scale=None, | 1607 test_apk=None, isolate_file_path=None, timeout_scale=None, |
| 1608 annotation=None, except_annotation=None, screenshot=False, | 1608 annotation=None, except_annotation=None, screenshot=False, |
| 1609 verbose=True, tool=None, host_driven_root=None, | 1609 verbose=True, tool=None, host_driven_root=None, |
| 1610 additional_apks=None): | 1610 additional_apks=None): |
| 1611 suite_defaults = ( | 1611 suite_defaults = ( |
| 1612 AndroidInstrumentationTest._DEFAULT_SUITES.get(name) | 1612 AndroidInstrumentationTest._DEFAULT_SUITES.get(name) |
| 1613 or AndroidInstrumentationTest._DEFAULT_SUITES_BY_TARGET.get(name) | 1613 or AndroidInstrumentationTest._DEFAULT_SUITES_BY_TARGET.get(name) |
| 1614 or {}) | 1614 or {}) |
| 1615 if not compile_targets: | 1615 if not compile_targets: |
| 1616 compile_targets = [suite_defaults['compile_target']] | 1616 compile_targets = [suite_defaults.get('compile_target', name)] |
| 1617 compile_targets.extend( | 1617 compile_targets.extend( |
| 1618 suite_defaults.get('additional_compile_targets', [])) | 1618 suite_defaults.get('additional_compile_targets', [])) |
| 1619 | 1619 |
| 1620 super(AndroidInstrumentationTest, self).__init__( | 1620 super(AndroidInstrumentationTest, self).__init__( |
| 1621 name, | 1621 name, |
| 1622 compile_targets, | 1622 compile_targets, |
| 1623 isolate_file_path or suite_defaults.get('isolate_file_path')) | 1623 isolate_file_path or suite_defaults.get('isolate_file_path')) |
| 1624 self._additional_apks = ( | 1624 self._additional_apks = ( |
| 1625 additional_apks or suite_defaults.get('additional_apks')) | 1625 additional_apks or suite_defaults.get('additional_apks')) |
| 1626 self._annotation = annotation | 1626 self._annotation = annotation |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1863 def run(self, api, suffix, test_filter=None): | 1863 def run(self, api, suffix, test_filter=None): |
| 1864 api.chromium_android.coverage_report(upload=False) | 1864 api.chromium_android.coverage_report(upload=False) |
| 1865 api.chromium_android.get_changed_lines_for_revision() | 1865 api.chromium_android.get_changed_lines_for_revision() |
| 1866 api.chromium_android.incremental_coverage_report() | 1866 api.chromium_android.incremental_coverage_report() |
| 1867 | 1867 |
| 1868 | 1868 |
| 1869 GOMA_TESTS = [ | 1869 GOMA_TESTS = [ |
| 1870 GTestTest('base_unittests'), | 1870 GTestTest('base_unittests'), |
| 1871 GTestTest('content_unittests'), | 1871 GTestTest('content_unittests'), |
| 1872 ] | 1872 ] |
| OLD | NEW |