From 8d5aef84dbf7a29beefa79f0ca62668423922ac7 Mon Sep 17 00:00:00 2001 From: Abhishek Arya Date: Mon, 18 May 2020 08:23:28 -0700 Subject: [PATCH] Use hardcoded FUZZING_LANGUAGE to unbreak CIFuzz. (#3844) --- infra/cifuzz/cifuzz.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/infra/cifuzz/cifuzz.py b/infra/cifuzz/cifuzz.py index c4d138b91..2733dd187 100644 --- a/infra/cifuzz/cifuzz.py +++ b/infra/cifuzz/cifuzz.py @@ -136,9 +136,16 @@ def build_fuzzers(project_name, # Build Fuzzers using docker run. command = [ - '--cap-add', 'SYS_PTRACE', '-e', 'FUZZING_ENGINE=' + DEFAULT_ENGINE, '-e', - 'SANITIZER=' + DEFAULT_SANITIZER, '-e', - 'ARCHITECTURE=' + DEFAULT_ARCHITECTURE + '--cap-add', + 'SYS_PTRACE', + '-e', + 'FUZZING_ENGINE=' + DEFAULT_ENGINE, + '-e', + 'SANITIZER=' + DEFAULT_SANITIZER, + '-e', + 'ARCHITECTURE=' + DEFAULT_ARCHITECTURE, + '-e', + 'FUZZING_LANGUAGE=c++', # FIXME: Add proper support. ] container = utils.get_container_name() if container: @@ -244,9 +251,14 @@ def check_fuzzer_build(out_dir): return False command = [ - '--cap-add', 'SYS_PTRACE', '-e', 'FUZZING_ENGINE=' + DEFAULT_ENGINE, '-e', - 'SANITIZER=' + DEFAULT_SANITIZER, '-e', - 'ARCHITECTURE=' + DEFAULT_ARCHITECTURE + '--cap-add', + 'SYS_PTRACE', + '-e', + 'FUZZING_ENGINE=' + DEFAULT_ENGINE, + '-e', + 'SANITIZER=' + DEFAULT_SANITIZER, + '-e', + 'ARCHITECTURE=' + DEFAULT_ARCHITECTURE, ] # Set ALLOWED_BROKEN_TARGETS_PERCENTAGE in docker if specified by user.