leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

torture: Save a few lines by using config_override_param initially

Browse Source 
This commit saves a few lines of code by also using the bash
config_override_param() to set the initial list of Kconfig options from
the CFcommon file.  While in the area, it makes this function capable of
update-in-place on the file containing the cumulative Kconfig options,
thus avoiding annoying changes when adding another source of options.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
Paul E. McKenney 2020-04-09 16:58:00 -07:00
parent 5b6b4b69ad
commit 409670aa26
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,35 +46,29 @@ echo ' ---' `date`: Starting build
echo ' ---' Kconfig fragment at: $config_template >> $resdir/log echo ' ---' Kconfig fragment at: $config_template >> $resdir/log
touch $resdir/ConfigFragment.input touch $resdir/ConfigFragment.input
# Combine additional Kconfig options into an existing set such that newer # Combine additional Kconfig options into an existing set such that
# options win. The first argument is the Kconfig source ID, the second # newer options win. The first argument is the Kconfig source ID, the
# the source file within $T, the third the destination file within $T, # second the to-be-updated file within $T, and the third and final the
# and the fourth and final the list of additional Kconfig options. # list of additional Kconfig options. Note that a $2.tmp file is
# created when doing the update.
config_override_param () { config_override_param () {
if test -n "$4" if test -n "$3"
then then
echo $4 | sed -e 's/^ *//' -e 's/ *$//' | tr -s " " "\012" > $T/Kconfig_args echo $3 | sed -e 's/^ *//' -e 's/ *$//' | tr -s " " "\012" > $T/Kconfig_args
echo " --- $1" >> $resdir/ConfigFragment.input echo " --- $1" >> $resdir/ConfigFragment.input
cat $T/Kconfig_args >> $resdir/ConfigFragment.input cat $T/Kconfig_args >> $resdir/ConfigFragment.input
config_override.sh $T/$2 $T/Kconfig_args > $T/$3 config_override.sh $T/$2 $T/Kconfig_args > $T/$2.tmp
mv $T/$2.tmp $T/$2
# Note that "#CHECK#" is not permitted on commandline. # Note that "#CHECK#" is not permitted on commandline.
else
cp $T/$2 $T/$3
fi fi
} }
if test -r "$config_dir/CFcommon" echo > $T/KcList
then config_override_param "$config_dir/CFcommon" KcList "`cat $config_dir/CFcommon 2> /dev/null`"
echo " --- $config_dir/CFcommon" >> $resdir/ConfigFragment.input config_override_param "$config_template" KcList "`cat $config_template 2> /dev/null`"
cat < $config_dir/CFcommon >> $resdir/ConfigFragment.input config_override_param "--kcsan options" KcList "$TORTURE_KCONFIG_KCSAN_ARG"
cp $config_dir/CFcommon $T/Kc0 config_override_param "--kconfig argument" KcList "$TORTURE_KCONFIG_ARG"
else cp $T/KcList $resdir/ConfigFragment
echo > $T/Kc0
fi
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
base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'` base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
if test "$base_resdir" != "$resdir" -a -f $base_resdir/bzImage -a -f $base_resdir/vmlinux if test "$base_resdir" != "$resdir" -a -f $base_resdir/bzImage -a -f $base_resdir/vmlinux
@ -87,7 +81,7 @@ then
ln -s $base_resdir/.config $resdir # for kvm-recheck.sh ln -s $base_resdir/.config $resdir # for kvm-recheck.sh
# Arch-independent indicator # Arch-independent indicator
touch $resdir/builtkernel touch $resdir/builtkernel
elif kvm-build.sh $T/Kc3 $resdir elif kvm-build.sh $T/KcList $resdir
then then
# Had to build a kernel for this test. # Had to build a kernel for this test.
QEMU="`identify_qemu vmlinux`" QEMU="`identify_qemu vmlinux`"