Skip to content

Commit

Permalink
infra: add proj name to env for fuzz introspector (#7856)
Browse files Browse the repository at this point in the history
* infra: add proj name to env for fuzz introspector

Depends on ossf/fuzz-introspector#327

Ref: ossf/fuzz-introspector#317

* lint fix

* update introspector commit

Co-authored-by: Navidem <navid.emamdoost@gmail.com>
  • Loading branch information
DavidKorczynski and Navidem committed Jun 14, 2022
1 parent bc64e72 commit a972a93
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions infra/base-images/base-builder/compile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/base-images/base-clang/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
5 changes: 2 additions & 3 deletions infra/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a972a93

Please sign in to comment.