Skip to content

Commit

Permalink
fuzz.sh: add new boards/native_sim_libfuzzer.conf
Browse files Browse the repository at this point in the history
Extract -DCONFIG_* definitions hardcoded inside the script and move them
to a new .conf file where they belong.

This is a first, baby-step towards addressing the more general lack of
.config control described in #9386

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
  • Loading branch information
marc-hb authored and lgirdwood committed Aug 23, 2024
1 parent 371245b commit 577c9ae
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
11 changes: 11 additions & 0 deletions app/boards/native_sim_libfuzzer.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# See https://docs.zephyrproject.org/latest/build/kconfig/setting.html#initial-conf

CONFIG_ZEPHYR_POSIX=y
CONFIG_ASSERT=y
CONFIG_EXCEPTION_DEBUG=y
CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
CONFIG_SYS_HEAP_BIG_ONLY=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_ARCH_POSIX_LIBFUZZER=y
CONFIG_ZEPHYR_POSIX_FUZZ_TICKS=100
CONFIG_ASAN=y
16 changes: 3 additions & 13 deletions scripts/fuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,8 @@ main()
# This also drops _leading_ '--'.
shift $((OPTIND-1))

# Move this to a new fuzz.conf EXTRA_CONF_FILE if it grows bigger
local fuzz_configs=(
-DCONFIG_ZEPHYR_POSIX=y
-DCONFIG_ASSERT=y
-DCONFIG_EXCEPTION_DEBUG=y
-DCONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
-DCONFIG_SYS_HEAP_BIG_ONLY=y
-DCONFIG_ZEPHYR_NATIVE_DRIVERS=y
-DCONFIG_ARCH_POSIX_LIBFUZZER=y
-DCONFIG_ZEPHYR_POSIX_FUZZ_TICKS=100
-DCONFIG_ASAN=y
)
# https://docs.zephyrproject.org/latest/build/kconfig/setting.html#initial-conf
local conf_files_list='prj.conf;boards/native_sim_libfuzzer.conf'

# Note there's never any reason to delete fuzz_corpus/.
# Don't trust `west build -p` because it is not 100% unreliable,
Expand All @@ -125,7 +115,7 @@ main()
# When passing conflicting -DVAR='VAL UE1' -DVAR='VAL UE2' to CMake,
# the last 'VAL UE2' wins. Previous ones are silently ignored.
west build -d build-fuzz -b native_sim "$SOF_TOP"/app/ -- \
"${fuzz_configs[@]}" "$@"
-DCONF_FILE="$conf_files_list" "$@"
)

if $BUILD_ONLY; then
Expand Down

0 comments on commit 577c9ae

Please sign in to comment.