Commit 3d17ded9 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

torture: Allow --kconfig options to override --kcsan defaults 



Currently, attempting to override a --kcsan default with a --kconfig
option might or might not work.  However, it would be good to allow the
user to adjust the --kcsan defaults, for example, to specify a different
time for CONFIG_KCSAN_REPORT_ONCE_IN_MS.  This commit therefore uses the
new config_override_param() bash function to apply the --kcsan defaults
and then apply the --kconfig options, which allows this overriding
to occur.

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

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

+4 −3
Original line number Diff line number Diff line
@@ -73,8 +73,9 @@ else 
fi

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

cat $config_template >> $resdir/ConfigFragment.input

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

cp $T/Kc2 $resdir/ConfigFragment

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



base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`

if test "$base_resdir" != "$resdir" -a -f $base_resdir/bzImage -a -f $base_resdir/vmlinux
@@ -87,7 +88,7 @@ then 
	ln -s $base_resdir/.config $resdir  # for kvm-recheck.sh

	# Arch-independent indicator

	touch $resdir/builtkernel

elif kvm-build.sh $T/Kc2 $resdir

elif kvm-build.sh $T/Kc3 $resdir

then

	# Had to build a kernel for this test.

	QEMU="`identify_qemu vmlinux`"

tools/testing/selftests/rcutorture/bin/kvm.sh

+0 −3
Original line number Diff line number Diff line
@@ -205,9 +205,6 @@ else 
	exit 1

fi



TORTURE_KCONFIG_ARG="${TORTURE_KCONFIG_ARG} ${TORTURE_KCONFIG_KCSAN_ARG}"

TORTURE_KCONFIG_ARG="`echo ${TORTURE_KCONFIG_ARG} | sed -e 's/^ *//' -e 's/ *$//'`"



CONFIGFRAG=${KVM}/configs/${TORTURE_SUITE}; export CONFIGFRAG



defaultconfigs="`tr '\012' ' ' < $CONFIGFRAG/CFLIST`"