Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: scripts/slave/recipes/chromium_trybot.py

Issue 907393002: Don't always run the script tests if there are no compile targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 from infra.libs.infra_types import freeze 5 from infra.libs.infra_types import freeze
6 6
7 DEPS = [ 7 DEPS = [
8 'bot_update', 8 'bot_update',
9 'chromium', 9 'chromium',
10 'chromium_android', 10 'chromium_android',
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 master_dict, 537 master_dict,
538 override_bot_type='builder_tester', 538 override_bot_type='builder_tester',
539 override_tests=tests) 539 override_tests=tests)
540 540
541 requires_compile, _, compile_targets = \ 541 requires_compile, _, compile_targets = \
542 api.chromium_tests.analyze( 542 api.chromium_tests.analyze(
543 all_compile_targets(api, tests + tests_including_triggered), 543 all_compile_targets(api, tests + tests_including_triggered),
544 compile_targets, 544 compile_targets,
545 'trybot_analyze_config.json') 545 'trybot_analyze_config.json')
546 546
547 if requires_compile: 547 if not requires_compile:
548 tests = tests_in_compile_targets(api, compile_targets, tests) 548 return
549 tests_including_triggered = tests_in_compile_targets(
550 api, compile_targets, tests_including_triggered)
551 549
552 api.chromium_tests.compile_specific_targets( 550 tests = tests_in_compile_targets(api, compile_targets, tests)
553 main_waterfall_config['mastername'], 551 tests_including_triggered = tests_in_compile_targets(
554 main_waterfall_config['buildername'], 552 api, compile_targets, tests_including_triggered)
555 bot_update_step, 553
556 master_dict, 554 api.chromium_tests.compile_specific_targets(
557 test_spec, 555 main_waterfall_config['mastername'],
558 compile_targets, 556 main_waterfall_config['buildername'],
559 tests_including_triggered, 557 bot_update_step,
560 override_bot_type='builder_tester', 558 master_dict,
561 disable_isolate=bot_config.get('disable_isolate', False)) 559 test_spec,
562 else: 560 compile_targets,
563 # Even though the patch doesn't require compile, we'd still like to 561 tests_including_triggered,
564 # run tests not depending on compiled targets (that's obviously not 562 override_bot_type='builder_tester',
565 # covered by the "analyze" step). 563 disable_isolate=bot_config.get('disable_isolate', False))
566 tests = [t for t in tests if not t.compile_targets(api)]
567 564
568 def deapply_patch_fn(failing_tests): 565 def deapply_patch_fn(failing_tests):
569 api.chromium_tests.deapply_patch(bot_update_step) 566 api.chromium_tests.deapply_patch(bot_update_step)
570 compile_targets = list(api.itertools.chain( 567 compile_targets = list(api.itertools.chain(
571 *[t.compile_targets(api) for t in failing_tests])) 568 *[t.compile_targets(api) for t in failing_tests]))
572 if compile_targets: 569 if compile_targets:
573 # Remove duplicate targets. 570 # Remove duplicate targets.
574 compile_targets = sorted(set(compile_targets)) 571 compile_targets = sorted(set(compile_targets))
575 # Search for *.isolated only if enabled in bot config or if some 572 # Search for *.isolated only if enabled in bot config or if some
576 # swarming test is being recompiled. 573 # swarming test is being recompiled.
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 tryserver=True) 1054 tryserver=True)
1058 yield step_failure(mastername='tryserver.chromium.linux', 1055 yield step_failure(mastername='tryserver.chromium.linux',
1059 buildername='android_clang_dbg_recipe', 1056 buildername='android_clang_dbg_recipe',
1060 steps=['check licenses (with patch)'], 1057 steps=['check licenses (with patch)'],
1061 tryserver=True) 1058 tryserver=True)
1062 yield step_failure(mastername='tryserver.chromium.linux', 1059 yield step_failure(mastername='tryserver.chromium.linux',
1063 buildername='android_clang_dbg_recipe', 1060 buildername='android_clang_dbg_recipe',
1064 steps=['check licenses (with patch)', 1061 steps=['check licenses (with patch)',
1065 'check licenses (without patch)'], 1062 'check licenses (without patch)'],
1066 tryserver=True) 1063 tryserver=True)
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_practice_rel_ng_analyze.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698