diff options
author | Elliott Hughes <enh@google.com> | 2021-04-02 20:29:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 20:29:09 +0000 |
commit | 8dd31c7112ba7b07fcafe02c83dc9ef3808cdab7 (patch) | |
tree | 328e6c9629b196cec1de3a94ee804d9fee3a0524 /infra/cifuzz/build_fuzzers_entrypoint.py | |
parent | 1bddf265a8faeccdfb8494c5f6cca5598142f59a (diff) | |
parent | 75c8dcf71ca8652f671b4ca5fea780a558c86e08 (diff) | |
download | oss-fuzz-8dd31c7112ba7b07fcafe02c83dc9ef3808cdab7.tar.gz |
Upgrade oss-fuzz to 947169dc86572e121c3e138f366a9f39ac6266ae am: f3764d0712 am: 1117028736 am: 235e96b2f8 am: 75c8dcf71candroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/oss-fuzz/+/1662261
Change-Id: I968ed19a4d61f3a70193f29ed73d211e174339f2
Diffstat (limited to 'infra/cifuzz/build_fuzzers_entrypoint.py')
-rw-r--r-- | infra/cifuzz/build_fuzzers_entrypoint.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/infra/cifuzz/build_fuzzers_entrypoint.py b/infra/cifuzz/build_fuzzers_entrypoint.py index 9c4b98215..04f562068 100644 --- a/infra/cifuzz/build_fuzzers_entrypoint.py +++ b/infra/cifuzz/build_fuzzers_entrypoint.py @@ -72,10 +72,16 @@ def main(): return returncode out_dir = os.path.join(config.workspace, 'out') + + if not config.bad_build_check: + # If we've gotten to this point and we don't need to do bad_build_check, + # then the build has succeeded. + returncode = 0 # yapf: disable - if build_fuzzers.check_fuzzer_build( + elif build_fuzzers.check_fuzzer_build( out_dir, - sanitizer=config.sanitizer, + config.sanitizer, + config.language, allowed_broken_targets_percentage=config.allowed_broken_targets_percentage ): # yapf: enable |