diff options
| author |  DavidKorczynski <david@adalogics.com> | 2022-06-14 21:26:06 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-06-14 15:26:06 -0500 |
| commit | a972a93b2a58902ff4a3ca2d604cd265b3afe209 (patch) | |
| tree | de963b5da5ba1c1f169c8fea0e102fb962ba5edd /infra | |
| parent | bc64e722b0b53b50d4d35c1b73c4175947d96b2c (diff) | |
infra: add proj name to env for fuzz introspector (#7856)
* infra: add proj name to env for fuzz introspector
Depends on https://github.com/ossf/fuzz-introspector/pull/327
Ref: https://github.com/ossf/fuzz-introspector/issues/317
* lint fix
* update introspector commit
Co-authored-by: Navidem <navid.emamdoost@gmail.com>
Diffstat (limited to 'infra')
| -rwxr-xr-x | infra/base-images/base-builder/compile | 1 | ||||
| -rw-r--r-- | infra/base-images/base-clang/Dockerfile | 2 | ||||
| -rwxr-xr-x | infra/helper.py | 5 |
3 files changed, 4 insertions, 4 deletions
diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile index 6e2bff24..1cd367af 100755 --- a/infra/base-images/base-builder/compile +++ b/infra/base-images/base-builder/compile @@ -240,6 +240,7 @@ if [ "$SANITIZER" = "introspector" ]; then fi # Use the just-generated correlation file REPORT_ARGS="$REPORT_ARGS --correlation_file=exe_to_fuzz_introspector_logs.yaml" + REPORT_ARGS="$REPORT_ARGS --name=$PROJECT_NAME" python3 /fuzz-introspector/post-processing/main.py report $REPORT_ARGS cp -rf $SRC/inspector $OUT/inspector diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile index 4c0e50f7..8983e54f 100644 --- a/infra/base-images/base-clang/Dockerfile +++ b/infra/base-images/base-clang/Dockerfile @@ -36,7 +36,7 @@ RUN apt-get update && apt-get install -y wget sudo && \ RUN apt-get update && apt-get install -y git && \ git clone https://github.com/ossf/fuzz-introspector.git fuzz-introspector && \ cd fuzz-introspector && \ - git checkout fd7a9ed71549bc4b7bf9dcca47b1b3fcc58ba791 && \ + git checkout 38e75235115a478fa924535f94ccbc8883f166f9 && \ apt-get remove --purge -y git COPY checkout_build_install_llvm.sh /root/ diff --git a/infra/helper.py b/infra/helper.py index ad417375..4c75ece9 100755 --- a/infra/helper.py +++ b/infra/helper.py @@ -639,9 +639,8 @@ def build_fuzzers_impl( # pylint: disable=too-many-arguments,too-many-locals,to else: logging.info('Keeping existing build artifacts as-is (if any).') env = [ - 'FUZZING_ENGINE=' + engine, - 'SANITIZER=' + sanitizer, - 'ARCHITECTURE=' + architecture, + 'FUZZING_ENGINE=' + engine, 'SANITIZER=' + sanitizer, + 'ARCHITECTURE=' + architecture, 'PROJECT_NAME=' + project.name ] _add_oss_fuzz_ci_if_needed(env) |