OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
6 | 6 |
7 | 7 |
8 DEPS = [ | 8 DEPS = [ |
9 'archive', | 9 'archive', |
10 'depot_tools/bot_update', | 10 'depot_tools/bot_update', |
| 11 'depot_tools/infra_paths', |
11 'chromium', | 12 'chromium', |
12 'file', | 13 'file', |
13 'recipe_engine/json', | 14 'recipe_engine/json', |
14 'recipe_engine/path', | 15 'recipe_engine/path', |
15 'recipe_engine/platform', | 16 'recipe_engine/platform', |
16 'recipe_engine/properties', | 17 'recipe_engine/properties', |
17 'recipe_engine/python', | 18 'recipe_engine/python', |
18 'recipe_engine/raw_io', | 19 'recipe_engine/raw_io', |
19 'recipe_engine/step', | 20 'recipe_engine/step', |
20 ] | 21 ] |
(...skipping 23 matching lines...) Expand all Loading... |
44 }, | 45 }, |
45 }, | 46 }, |
46 }) | 47 }) |
47 | 48 |
48 | 49 |
49 def gn_refs(api, step_name, args): | 50 def gn_refs(api, step_name, args): |
50 """Runs gn refs with given additional arguments. | 51 """Runs gn refs with given additional arguments. |
51 Returns: the list of matched targets. | 52 Returns: the list of matched targets. |
52 """ | 53 """ |
53 step_result = api.python(step_name, | 54 step_result = api.python(step_name, |
54 api.path['depot_tools'].join('gn.py'), | 55 api.infra_paths['depot_tools'].join('gn.py'), |
55 ['--root=%s' % str(api.path['checkout']), | 56 ['--root=%s' % str(api.path['checkout']), |
56 'refs', | 57 'refs', |
57 str(api.chromium.output_dir), | 58 str(api.chromium.output_dir), |
58 ] + args, | 59 ] + args, |
59 stdout=api.raw_io.output()) | 60 stdout=api.raw_io.output()) |
60 return step_result.stdout.split() | 61 return step_result.stdout.split() |
61 | 62 |
62 | 63 |
63 def RunSteps(api): | 64 def RunSteps(api): |
64 mastername = api.m.properties['mastername'] | 65 mastername = api.m.properties['mastername'] |
(...skipping 20 matching lines...) Expand all Loading... |
85 '--type=executable', | 86 '--type=executable', |
86 '--as=output', | 87 '--as=output', |
87 '//testing/libfuzzer:no_clusterfuzz']) | 88 '//testing/libfuzzer:no_clusterfuzz']) |
88 targets = list(set(all_fuzzers).difference(set(no_clusterfuzz))) | 89 targets = list(set(all_fuzzers).difference(set(no_clusterfuzz))) |
89 api.step.active_result.presentation.logs['all_fuzzers'] = all_fuzzers | 90 api.step.active_result.presentation.logs['all_fuzzers'] = all_fuzzers |
90 api.step.active_result.presentation.logs['no_clusterfuzz'] = no_clusterfuzz | 91 api.step.active_result.presentation.logs['no_clusterfuzz'] = no_clusterfuzz |
91 api.step.active_result.presentation.logs['targets'] = targets | 92 api.step.active_result.presentation.logs['targets'] = targets |
92 api.chromium.compile(targets=targets) | 93 api.chromium.compile(targets=targets) |
93 | 94 |
94 api.archive.clusterfuzz_archive( | 95 api.archive.clusterfuzz_archive( |
95 build_dir=api.path['slave_build'].join('src', 'out', 'Release'), | 96 build_dir=api.infra_paths['slave_build'].join( |
| 97 'src', 'out', 'Release'), |
96 update_properties=checkout_results.json.output['properties'], | 98 update_properties=checkout_results.json.output['properties'], |
97 gs_bucket=bot_config['upload_bucket'], | 99 gs_bucket=bot_config['upload_bucket'], |
98 archive_prefix='drfuzz', | 100 archive_prefix='drfuzz', |
99 archive_subdir_suffix=bot_config['upload_directory'], | 101 archive_subdir_suffix=bot_config['upload_directory'], |
100 gs_acl='public-read') | 102 gs_acl='public-read') |
101 | 103 |
102 def GenTests(api): | 104 def GenTests(api): |
103 for test in api.chromium.gen_tests_for_builders(BUILDERS): | 105 for test in api.chromium.gen_tests_for_builders(BUILDERS): |
104 yield (test + | 106 yield (test + |
105 api.step_data('calculate all_fuzzers', | 107 api.step_data('calculate all_fuzzers', |
106 stdout=api.raw_io.output('target1 target2 target3')) + | 108 stdout=api.raw_io.output('target1 target2 target3')) + |
107 api.step_data('calculate no_clusterfuzz', | 109 api.step_data('calculate no_clusterfuzz', |
108 stdout=api.raw_io.output('target1')) | 110 stdout=api.raw_io.output('target1')) |
109 ) | 111 ) |
110 | 112 |
OLD | NEW |