From 5ac26e09760c0768c6c98b35d36b163c40b5561b Mon Sep 17 00:00:00 2001
From: Zach Riggle <riggle@google.com>
Date: Thu, 19 Apr 2018 13:34:19 -0500
Subject: [PATCH] Enable invocation of 32-bit fuzzers
Previously we would only invoke 64-bit fuzzers. We still prefer 64-bit, but
will fall back to 32-bit if that's the only thing that exists (e.g. codecs).
Change-Id: I32e7f6c3b157eade17e7ce5ad77054b54fda4bba
---
fuzzing/fuzz/fuzz | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fuzzing/fuzz/fuzz b/fuzzing/fuzz/fuzz
index 7b2bc38..fe569ab 100644
--- a/fuzzing/fuzz/fuzz
+++ b/fuzzing/fuzz/fuzz
@@ -15,7 +15,7 @@
# Abort on any error
# Global configuration
-FUZZER_BASE="/data/nativetest64/fuzzers"
+FUZZER_BASES=( "/data/nativetest64/fuzzers" "/data/nativetest/fuzzers" )
WORK_BASE="/data/local/tmp/fuzz"
LAST_FUZZ="$WORK_BASE/last_session"
@@ -150,11 +150,11 @@ if [ -e $1 ]; then
FUZZER="$(basename $FUZZER_BIN)"
else
FUZZER="${1%_fuzzer}"
- FUZZER_BIN="${FUZZER_BASE}/${OPT_ENGINE}/${FUZZER}_fuzzer/${FUZZER}_fuzzer"
- if [ ! -e "$FUZZER_BIN" ]; then
- die "Invalid fuzzer name ${FUZZER}: ($FUZZER_BIN does not exist)"
- fi
+ for FUZZER_BASE in "${FUZZER_BASES[@]}"; do
+ FUZZER_BIN="${FUZZER_BASE}/${OPT_ENGINE}/${FUZZER}_fuzzer/${FUZZER}_fuzzer"
+ [ -e "$FUZZER_BIN" ] && break
+ done
fi
shift
--
GitLab