aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/base-images
diff options
context:
space:
mode:
authorGravatar DavidKorczynski <david@adalogics.com>2022-04-04 23:38:37 +0100
committerGravatar GitHub <noreply@github.com>2022-04-04 23:38:37 +0100
commit0bcaec68ab47901d9d7410a353896cc1613aae4c (patch)
treed18ed2fa547862f3b8db83e44db2fcf243d3f6c7 /infra/base-images
parent696a4dd4e50d76f11a8933316d4491169c55aeee (diff)
infra: fuzz-introspector: ensure COVERAGE_URL exists (#7502)
* infra: fuzz-introspector: ensure COVERAGE_URL exists This is to make sure fuzz-introspector can run in local builds. Ref: https://github.com/ossf/fuzz-introspector/issues/48#issuecomment-1087513497 Ref: https://github.com/ossf/fuzz-introspector/issues/67#issuecomment-1087518856 * refactor fuzz-introspector command generation This is to shorten the long line that runs fuzz-introspector and also in anticipation that down the line we will have more oss-fuzz specific commands in fuzz-introspector
Diffstat (limited to 'infra/base-images')
-rwxr-xr-xinfra/base-images/base-builder/compile14
1 files changed, 13 insertions, 1 deletions
diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile
index 9a205cf4..3c7736c6 100755
--- a/infra/base-images/base-builder/compile
+++ b/infra/base-images/base-builder/compile
@@ -216,8 +216,20 @@ if [ "$SANITIZER" = "introspector" ]; then
fi
cd $SRC/inspector
+
+ # Correlate fuzzer binaries to fuzz-introspector's raw data
python3 /fuzz-introspector/post-processing/main.py correlate --binaries_dir=$OUT/
- python3 /fuzz-introspector/post-processing/main.py report --target_dir=$SRC/inspector --coverage_url=$COVERAGE_URL --correlation_file=exe_to_fuzz_introspector_logs.yaml
+
+ # Generate fuzz-introspector HTML report, this generates
+ # the file exe_to_fuzz_introspector_logs.yaml
+ REPORT_ARGS="--target_dir=$SRC/inspector"
+ # Only pass coverage_url when COVERAGE_URL is set (in cloud builds)
+ if [[ ! -z "${COVERAGE_URL+x}" ]]; then
+ REPORT_ARGS="$REPORT_ARGS --coverage_url=${COVERAGE_URL}"
+ fi
+ # Use the just-generated correlation file
+ REPORT_ARGS="$REPORT_ARGS --correlation_file=exe_to_fuzz_introspector_logs.yaml"
+ python3 /fuzz-introspector/post-processing/main.py report $REPORT_ARGS
cp -rf $SRC/inspector $OUT/inspector
fi