openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
Paul E. McKenney 2020-04-09 16:38:20 -07:00
parent 3d17ded902
commit 5b6b4b69ad
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,12 +67,11 @@ if test -r "$config_dir/CFcommon"
then then
echo " --- $config_dir/CFcommon" >> $resdir/ConfigFragment.input echo " --- $config_dir/CFcommon" >> $resdir/ConfigFragment.input
cat < $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 else
cp $config_template $T/Kc1 echo > $T/Kc0
fi fi
echo " --- $config_template" >> $resdir/ConfigFragment.input config_override_param "$config_template" Kc0 Kc1 "`cat $config_template 2> /dev/null`"
cat $config_template >> $resdir/ConfigFragment.input
config_override_param "--kcsan options" Kc1 Kc2 "$TORTURE_KCONFIG_KCSAN_ARG" config_override_param "--kcsan options" Kc1 Kc2 "$TORTURE_KCONFIG_KCSAN_ARG"
config_override_param "--kconfig argument" Kc2 Kc3 "$TORTURE_KCONFIG_ARG" config_override_param "--kconfig argument" Kc2 Kc3 "$TORTURE_KCONFIG_ARG"
cp $T/Kc3 $resdir/ConfigFragment cp $T/Kc3 $resdir/ConfigFragment