Commit 5b6b4b69 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

torture: Allow scenario-specific Kconfig options to override CFcommon 



This commit applies config_override_param() to allow scenario-specific
Kconfig options to override those in CFcommon.  This in turn will allow
additional Kconfig options to be placed in CFcommon, for example, an
option common to all but a few scenario can be placed in CFcommon and
then overridden in those few scenarios.  Plus this change saves one
whole line of code.

Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 3d17ded9

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh

+3 −4
Original line number Diff line number Diff line
@@ -67,12 +67,11 @@ if test -r "$config_dir/CFcommon" 
then

	echo " --- $config_dir/CFcommon" >> $resdir/ConfigFragment.input

	cat < $config_dir/CFcommon >> $resdir/ConfigFragment.input

	config_override.sh $config_dir/CFcommon $config_template > $T/Kc1

	cp $config_dir/CFcommon $T/Kc0

else

	cp $config_template $T/Kc1

	echo > $T/Kc0

fi

echo " --- $config_template" >> $resdir/ConfigFragment.input

cat $config_template >> $resdir/ConfigFragment.input

config_override_param "$config_template" Kc0 Kc1 "`cat $config_template 2> /dev/null`"

config_override_param "--kcsan options" Kc1 Kc2 "$TORTURE_KCONFIG_KCSAN_ARG"

config_override_param "--kconfig argument" Kc2 Kc3 "$TORTURE_KCONFIG_ARG"

cp $T/Kc3 $resdir/ConfigFragment