Skip to content

Commit

Permalink
fuzz.sh: replace deprecated OVERLAY_CONFIG with newer EXTRA_CONF_FILE
Browse files Browse the repository at this point in the history
OVERLAY_CONFIG was deprecated in Zephyr 3.4 commit
https://github.com/zephyrproject-rtos/zephyr/commits/3a345682ba81

Also enhance example and demonstrate the syntax to pass multiple files.

This finishes the work started by commit 6cd34c8
("xtensa-build-zephyr.py: use EXTRA_CONF_FILE instead of OVERLAY_CONFIG")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
  • Loading branch information
marc-hb committed Aug 20, 2024
1 parent 2e39952 commit ab3e5fa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ jobs:
clang --verbose
set -x
sof/scripts/fuzz.sh -b -- -DEXTRA_CFLAGS='-Werror' -DEXTRA_CXXFLAGS='-Werror' \
-DOVERLAY_CONFIG=stub_build_all_${{ matrix.IPC }}.conf
-DEXTRA_CONF_FILE='stub_build_all_${{ matrix.IPC }}.conf'
10 changes: 5 additions & 5 deletions scripts/fuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ print_help()
Usage:
$0 -b -- -DOVERLAY_CONFIG=stub_build_all_ipc4.conf -DEXTRA_CFLAGS="-O0 -g3" ...
$0 -t 500 -- -DOVERLAY_CONFIG=stub_build_all_ipc3.conf ...
$0 -b -- -DEXTRA_CONF_FILE=stub_build_all_ipc4.conf -DEXTRA_CFLAGS="-O0 -g3" ...
$0 -t 500 -- -DEXTRA_CONF_FILE=stub_build_all_ipc3.conf ...
-p Delete build-fuzz/ first ("pristine")
-b Do not run/fuzz: stop after the build.
Expand Down Expand Up @@ -52,9 +52,9 @@ Versions 12+ have all been observed to work.
You will need the kconfigs specified below for correct operation,
but can add more at the end of this script's command line to
duplicate configurations as needed. Alternatively you can pass
overlay files in kconfig syntax via:
extra config files in kconfig syntax via:
fuzz.sh -t 300 -- -DOVERLAY_CONFIG=... -DEXTRA_CFLAGS='-Wone -Wtwo' ...
fuzz.sh -t 300 -- -DEXTRA_CONF_FILE='debug.conf;other.conf' -DEXTRA_CFLAGS='-Wone -Wtwo' ...
EOFHELP
}
Expand Down Expand Up @@ -103,7 +103,7 @@ main()
# This also drops _leading_ '--'.
shift $((OPTIND-1))

# Move this to a new fuzz.conf overlay file if it grows bigger
# Move this to a new fuzz.conf EXTRA_CONF_FILE if it grows bigger
local fuzz_configs=(
-DCONFIG_ZEPHYR_POSIX=y
-DCONFIG_ASSERT=y
Expand Down

0 comments on commit ab3e5fa

Please sign in to comment.