Chromium Code Reviews| 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 'chromium', | 10 'chromium', |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 'chromium_config': 'chromium_clang', | 26 'chromium_config': 'chromium_clang', |
| 27 'chromium_apply_config': [ 'proprietary_codecs' ], | 27 'chromium_apply_config': [ 'proprietary_codecs' ], |
| 28 'chromium_config_kwargs': { | 28 'chromium_config_kwargs': { |
| 29 'BUILD_CONFIG': 'Release', | 29 'BUILD_CONFIG': 'Release', |
| 30 'TARGET_PLATFORM': 'linux', | 30 'TARGET_PLATFORM': 'linux', |
| 31 'TARGET_BITS': 64, | 31 'TARGET_BITS': 64, |
| 32 }, | 32 }, |
| 33 'upload_bucket': 'chromium-browser-libfuzzer', | 33 'upload_bucket': 'chromium-browser-libfuzzer', |
| 34 'upload_directory': 'asan', | 34 'upload_directory': 'asan', |
| 35 }, | 35 }, |
| 36 'Libfuzzer Upload Linux ASan Debug': { | |
| 37 'chromium_config': 'chromium_clang', | |
| 38 'chromium_apply_config': [ 'proprietary_codecs' ], | |
| 39 'chromium_config_kwargs': { | |
| 40 'BUILD_CONFIG': 'Debug', | |
| 41 'TARGET_PLATFORM': 'linux', | |
| 42 'TARGET_BITS': 64, | |
| 43 }, | |
| 44 'upload_bucket': 'chromium-browser-libfuzzer', | |
| 45 'upload_directory': 'asan', | |
| 46 }, | |
| 36 'Libfuzzer Upload Linux MSan': { | 47 'Libfuzzer Upload Linux MSan': { |
| 37 'chromium_config': 'chromium_clang', | 48 'chromium_config': 'chromium_clang', |
| 38 'chromium_apply_config': ['msan', 'msan_full_origin_tracking', | 49 'chromium_apply_config': ['msan', 'msan_full_origin_tracking', |
| 39 'prebuilt_instrumented_libraries', | 50 'prebuilt_instrumented_libraries', |
| 40 'proprietary_codecs' ], | 51 'proprietary_codecs' ], |
| 41 'chromium_config_kwargs': { | 52 'chromium_config_kwargs': { |
| 42 'BUILD_CONFIG': 'Release', | 53 'BUILD_CONFIG': 'Release', |
| 43 'TARGET_PLATFORM': 'linux', | 54 'TARGET_PLATFORM': 'linux', |
| 44 'TARGET_BITS': 64, | 55 'TARGET_BITS': 64, |
| 45 }, | 56 }, |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 100 '--type=executable', | 111 '--type=executable', |
| 101 '--as=output', | 112 '--as=output', |
| 102 '//testing/libfuzzer:no_clusterfuzz']) | 113 '//testing/libfuzzer:no_clusterfuzz']) |
| 103 targets = list(set(all_fuzzers).difference(set(no_clusterfuzz))) | 114 targets = list(set(all_fuzzers).difference(set(no_clusterfuzz))) |
| 104 api.step.active_result.presentation.logs['all_fuzzers'] = all_fuzzers | 115 api.step.active_result.presentation.logs['all_fuzzers'] = all_fuzzers |
| 105 api.step.active_result.presentation.logs['no_clusterfuzz'] = no_clusterfuzz | 116 api.step.active_result.presentation.logs['no_clusterfuzz'] = no_clusterfuzz |
| 106 api.step.active_result.presentation.logs['targets'] = targets | 117 api.step.active_result.presentation.logs['targets'] = targets |
| 107 api.chromium.compile(targets=targets) | 118 api.chromium.compile(targets=targets) |
| 108 | 119 |
| 109 api.archive.clusterfuzz_archive( | 120 api.archive.clusterfuzz_archive( |
| 110 build_dir=api.path['slave_build'].join('src', 'out', 'Release'), | 121 build_dir=api.path['slave_build'].join('src', 'out', 'Release'), |
|
Oliver Chang
2016/05/09 16:46:30
I think this might need to be changed too, since i
mmoroz
2016/05/10 09:11:59
Nice catch, thanks! Done.
| |
| 111 update_properties=checkout_results.json.output['properties'], | 122 update_properties=checkout_results.json.output['properties'], |
| 112 gs_bucket=bot_config['upload_bucket'], | 123 gs_bucket=bot_config['upload_bucket'], |
| 113 archive_prefix='libfuzzer', | 124 archive_prefix='libfuzzer', |
| 114 archive_subdir_suffix=bot_config['upload_directory'], | 125 archive_subdir_suffix=bot_config['upload_directory'], |
| 115 gs_acl='public-read') | 126 gs_acl='public-read') |
| 116 | 127 |
| 117 | 128 |
| 118 def GenTests(api): | 129 def GenTests(api): |
| 119 for test in api.chromium.gen_tests_for_builders(BUILDERS): | 130 for test in api.chromium.gen_tests_for_builders(BUILDERS): |
| 120 yield (test + | 131 yield (test + |
| 121 api.step_data('calculate all_fuzzers', | 132 api.step_data('calculate all_fuzzers', |
| 122 stdout=api.raw_io.output('target1 target2 target3')) + | 133 stdout=api.raw_io.output('target1 target2 target3')) + |
| 123 api.step_data('calculate no_clusterfuzz', | 134 api.step_data('calculate no_clusterfuzz', |
| 124 stdout=api.raw_io.output('target1')) | 135 stdout=api.raw_io.output('target1')) |
| 125 ) | 136 ) |
| 126 | 137 |
| OLD | NEW |