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 from recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
6 | 6 |
7 DEPS = [ | 7 DEPS = [ |
8 'archive', | 8 'archive', |
9 'depot_tools/bot_update', | 9 'depot_tools/bot_update', |
| 10 'depot_tools/infra_paths', |
10 'chromium', | 11 'chromium', |
11 'file', | 12 'file', |
12 'recipe_engine/json', | 13 'recipe_engine/json', |
13 'recipe_engine/path', | 14 'recipe_engine/path', |
14 'recipe_engine/platform', | 15 'recipe_engine/platform', |
15 'recipe_engine/properties', | 16 'recipe_engine/properties', |
16 'recipe_engine/python', | 17 'recipe_engine/python', |
17 'recipe_engine/raw_io', | 18 'recipe_engine/raw_io', |
18 'recipe_engine/step', | 19 'recipe_engine/step', |
19 ] | 20 ] |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 }, | 61 }, |
61 }, | 62 }, |
62 }) | 63 }) |
63 | 64 |
64 | 65 |
65 def gn_refs(api, step_name, args): | 66 def gn_refs(api, step_name, args): |
66 """Runs gn refs with given additional arguments. | 67 """Runs gn refs with given additional arguments. |
67 Returns: the list of matched targets. | 68 Returns: the list of matched targets. |
68 """ | 69 """ |
69 step_result = api.python(step_name, | 70 step_result = api.python(step_name, |
70 api.path['depot_tools'].join('gn.py'), | 71 api.infra_paths['depot_tools'].join('gn.py'), |
71 ['--root=%s' % str(api.path['checkout']), | 72 ['--root=%s' % str(api.path['checkout']), |
72 'refs', | 73 'refs', |
73 str(api.chromium.output_dir), | 74 str(api.chromium.output_dir), |
74 ] + args, | 75 ] + args, |
75 stdout=api.raw_io.output()) | 76 stdout=api.raw_io.output()) |
76 return step_result.stdout.split() | 77 return step_result.stdout.split() |
77 | 78 |
78 | 79 |
79 def RunSteps(api): | 80 def RunSteps(api): |
80 mastername = api.m.properties['mastername'] | 81 mastername = api.m.properties['mastername'] |
(...skipping 19 matching lines...) Expand all Loading... |
100 '--type=executable', | 101 '--type=executable', |
101 '--as=output', | 102 '--as=output', |
102 '//testing/libfuzzer:no_clusterfuzz']) | 103 '//testing/libfuzzer:no_clusterfuzz']) |
103 targets = list(set(all_fuzzers).difference(set(no_clusterfuzz))) | 104 targets = list(set(all_fuzzers).difference(set(no_clusterfuzz))) |
104 api.step.active_result.presentation.logs['all_fuzzers'] = all_fuzzers | 105 api.step.active_result.presentation.logs['all_fuzzers'] = all_fuzzers |
105 api.step.active_result.presentation.logs['no_clusterfuzz'] = no_clusterfuzz | 106 api.step.active_result.presentation.logs['no_clusterfuzz'] = no_clusterfuzz |
106 api.step.active_result.presentation.logs['targets'] = targets | 107 api.step.active_result.presentation.logs['targets'] = targets |
107 api.chromium.compile(targets=targets) | 108 api.chromium.compile(targets=targets) |
108 | 109 |
109 api.archive.clusterfuzz_archive( | 110 api.archive.clusterfuzz_archive( |
110 build_dir=api.path['slave_build'].join('src', 'out', 'Release'), | 111 build_dir=api.infra_paths['slave_build'].join( |
| 112 'src', 'out', 'Release'), |
111 update_properties=checkout_results.json.output['properties'], | 113 update_properties=checkout_results.json.output['properties'], |
112 gs_bucket=bot_config['upload_bucket'], | 114 gs_bucket=bot_config['upload_bucket'], |
113 archive_prefix='libfuzzer', | 115 archive_prefix='libfuzzer', |
114 archive_subdir_suffix=bot_config['upload_directory'], | 116 archive_subdir_suffix=bot_config['upload_directory'], |
115 gs_acl='public-read') | 117 gs_acl='public-read') |
116 | 118 |
117 | 119 |
118 def GenTests(api): | 120 def GenTests(api): |
119 for test in api.chromium.gen_tests_for_builders(BUILDERS): | 121 for test in api.chromium.gen_tests_for_builders(BUILDERS): |
120 yield (test + | 122 yield (test + |
121 api.step_data('calculate all_fuzzers', | 123 api.step_data('calculate all_fuzzers', |
122 stdout=api.raw_io.output('target1 target2 target3')) + | 124 stdout=api.raw_io.output('target1 target2 target3')) + |
123 api.step_data('calculate no_clusterfuzz', | 125 api.step_data('calculate no_clusterfuzz', |
124 stdout=api.raw_io.output('target1')) | 126 stdout=api.raw_io.output('target1')) |
125 ) | 127 ) |
126 | 128 |
OLD | NEW |