OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 DEPS = [ | 5 DEPS = [ |
6 'bot_update', | 6 'bot_update', |
7 'chromium', | 7 'chromium', |
8 'chromium_tests', | 8 'chromium_tests', |
9 'gclient', | 9 'gclient', |
10 'isolate', | 10 'isolate', |
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
782 compile_targets, gtest_tests = parse_test_spec( | 782 compile_targets, gtest_tests = parse_test_spec( |
783 test_spec, | 783 test_spec, |
784 bot_config.get('enable_swarming'), | 784 bot_config.get('enable_swarming'), |
785 should_use_test) | 785 should_use_test) |
786 compile_targets.extend(bot_config.get('compile_targets', [])) | 786 compile_targets.extend(bot_config.get('compile_targets', [])) |
787 # TODO(phajdan.jr): Also compile 'all' on win, http://crbug.com/368831 . | 787 # TODO(phajdan.jr): Also compile 'all' on win, http://crbug.com/368831 . |
788 # Disabled for now because it takes too long and/or fails on Windows. | 788 # Disabled for now because it takes too long and/or fails on Windows. |
789 if not api.platform.is_win and not bot_config.get('exclude_compile_all'): | 789 if not api.platform.is_win and not bot_config.get('exclude_compile_all'): |
790 compile_targets = ['all'] + compile_targets | 790 compile_targets = ['all'] + compile_targets |
791 | 791 |
| 792 scripts_compile_targets = \ |
| 793 api.chromium.get_compile_targets_for_scripts().json.output |
| 794 |
792 # Tests that are only run if their compile_targets are going to be built. | 795 # Tests that are only run if their compile_targets are going to be built. |
793 conditional_tests = [api.chromium.steps.NaclIntegrationTest()] | 796 conditional_tests = [api.chromium.steps.NaclIntegrationTest()] |
794 if bot_config.get('add_telemetry_tests', True): | 797 if bot_config.get('add_telemetry_tests', True): |
795 conditional_tests += [api.chromium.steps.TelemetryUnitTests(), | 798 conditional_tests += [ |
796 api.chromium.steps.TelemetryPerfUnitTests()] | 799 api.chromium.steps.ScriptTest( |
| 800 'telemetry_unittests', 'telemetry_unittests.py', |
| 801 scripts_compile_targets), |
| 802 api.chromium.steps.TelemetryPerfUnitTests() |
| 803 ] |
797 | 804 |
798 # See if the patch needs to compile on the current platform. | 805 # See if the patch needs to compile on the current platform. |
799 # Don't run analyze for other projects, such as blink, as there aren't that | 806 # Don't run analyze for other projects, such as blink, as there aren't that |
800 # many try jobs for them. | 807 # many try jobs for them. |
801 requires_compile = True | 808 requires_compile = True |
802 if isinstance(test_spec, dict) and api.properties.get('root') == 'src': | 809 if isinstance(test_spec, dict) and api.properties.get('root') == 'src': |
803 analyze_config_file = bot_config['testing'].get('analyze_config_file', | 810 analyze_config_file = bot_config['testing'].get('analyze_config_file', |
804 'trybot_analyze_config.json') | 811 'trybot_analyze_config.json') |
805 requires_compile, matching_exes, compile_targets = \ | 812 requires_compile, matching_exes, compile_targets = \ |
806 api.chromium_tests.analyze( | 813 api.chromium_tests.analyze( |
807 get_test_names(gtest_tests) + | 814 get_test_names(gtest_tests) + |
808 all_compile_targets(api, conditional_tests), | 815 all_compile_targets(api, conditional_tests), |
809 compile_targets, | 816 compile_targets, |
810 analyze_config_file) | 817 analyze_config_file) |
811 | 818 |
812 gtest_tests = filter_tests(gtest_tests, matching_exes) | 819 gtest_tests = filter_tests(gtest_tests, matching_exes) |
813 | 820 |
814 tests = [] | 821 tests = [] |
815 # TODO(phajdan.jr): Re-enable checkdeps on Windows when it works with git. | 822 # TODO(phajdan.jr): Re-enable checkdeps on Windows when it works with git. |
816 if not api.platform.is_win: | 823 if not api.platform.is_win: |
817 tests.append(api.chromium.steps.ScriptTest('checkdeps', 'checkdeps.py')) | 824 tests.append(api.chromium.steps.ScriptTest( |
| 825 'checkdeps', 'checkdeps.py', scripts_compile_targets)) |
818 if api.platform.is_linux: | 826 if api.platform.is_linux: |
819 tests.extend([ | 827 tests.extend([ |
820 api.chromium.steps.CheckpermsTest(), | 828 api.chromium.steps.CheckpermsTest(), |
821 api.chromium.steps.ChecklicensesTest(), | 829 api.chromium.steps.ChecklicensesTest(), |
822 ]) | 830 ]) |
823 | 831 |
824 conditional_tests = tests_in_compile_targets( | 832 conditional_tests = tests_in_compile_targets( |
825 api, compile_targets, conditional_tests) | 833 api, compile_targets, conditional_tests) |
826 tests.extend(find_test_named(api.chromium.steps.TelemetryUnitTests.name, | 834 tests.extend(find_test_named('telemetry_unittests', conditional_tests)) |
827 conditional_tests)) | |
828 tests.extend(find_test_named(api.chromium.steps.TelemetryPerfUnitTests.name, | 835 tests.extend(find_test_named(api.chromium.steps.TelemetryPerfUnitTests.name, |
829 conditional_tests)) | 836 conditional_tests)) |
830 tests.extend(gtest_tests) | 837 tests.extend(gtest_tests) |
831 tests.extend(find_test_named(api.chromium.steps.NaclIntegrationTest.name, | 838 tests.extend(find_test_named(api.chromium.steps.NaclIntegrationTest.name, |
832 conditional_tests)) | 839 conditional_tests)) |
833 # MojoPythonTests don't require anything to be compiled. | 840 # MojoPythonTests don't require anything to be compiled. |
834 tests.append(api.chromium.steps.MojoPythonTests()) | 841 tests.append(api.chromium.steps.MojoPythonTests()) |
835 | 842 |
836 if api.platform.is_win: | 843 if api.platform.is_win: |
837 tests.append(api.chromium.steps.MiniInstallerTest()) | 844 tests.append(api.chromium.steps.MiniInstallerTest()) |
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1545 }, | 1552 }, |
1546 ], | 1553 ], |
1547 }) | 1554 }) |
1548 ) + | 1555 ) + |
1549 api.override_step_data( | 1556 api.override_step_data( |
1550 'analyze', | 1557 'analyze', |
1551 api.json.output({'status': 'Found dependency', | 1558 api.json.output({'status': 'Found dependency', |
1552 'targets': ['browser_tests', 'base_unittests'], | 1559 'targets': ['browser_tests', 'base_unittests'], |
1553 'build_targets': ['base_unittests']})) | 1560 'build_targets': ['base_unittests']})) |
1554 ) | 1561 ) |
OLD | NEW |