diff options
| author | jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2020-11-20 07:24:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 07:24:06 -0800 |
| commit | 640a9c2bcf3036742b769ef71ee89b0221b360b8 (patch) | |
| tree | 4e8218ccbf0ceb7f00a61eb4a42f77c4a000b784 /infra | |
| parent | 5e3f47dba6323aef4a85796a188ddf4fc0e445e2 (diff) | |
| download | oss-fuzz-640a9c2bcf3036742b769ef71ee89b0221b360b8.tar.gz | |
Fix test_all breakage (#4673)
Specify fuzzing language.
Intended to fix https://github.com/google/oss-fuzz/issues/4672
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/cifuzz/cifuzz.py | 2 | ||||
| -rwxr-xr-x | infra/helper.py | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/infra/cifuzz/cifuzz.py b/infra/cifuzz/cifuzz.py index 130cf51ed..b00df6d69 100644 --- a/infra/cifuzz/cifuzz.py +++ b/infra/cifuzz/cifuzz.py @@ -291,6 +291,8 @@ def check_fuzzer_build(out_dir, sanitizer='address'): 'SANITIZER=' + sanitizer, '-e', 'ARCHITECTURE=' + DEFAULT_ARCHITECTURE, + '-e', + 'FUZZING_LANGUAGE=c++', # FIXME: Add proper support. ] # Set ALLOWED_BROKEN_TARGETS_PERCENTAGE in docker if specified by user. diff --git a/infra/helper.py b/infra/helper.py index d91239df7..dc7366b43 100755 --- a/infra/helper.py +++ b/infra/helper.py @@ -595,10 +595,16 @@ def check_build(args): not _check_fuzzer_exists(args.project_name, args.fuzzer_name)): return 1 + fuzzing_language = _get_project_language(args.project_name) + if fuzzing_language is None: + print('WARNING: language not specified in project.yaml. Defaulting to C++.') + fuzzing_language = 'c++' + env = [ 'FUZZING_ENGINE=' + args.engine, 'SANITIZER=' + args.sanitizer, 'ARCHITECTURE=' + args.architecture, + 'FUZZING_LANGUAGE=' + fuzzing_language, ] if args.e: env += args.e |