Skip to content

Commit b5744d3

Browse files
committed
torture: Eliminate duplicate #CHECK# from ConfigFragment
The #CHECK# directives that can be present in CFcommon and in the rcutorture scenario Kconfig files are both copied to ConfigFragment and grepped out of the two directive files and added to ConfigFragment. This commit therefore removes the redundant "grep" commands and takes advantage of the consequent opportunity to simplify redirection. Signed-off-by: Paul E. McKenney <[email protected]>
1 parent afbc157 commit b5744d3

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,17 @@ then
4444
fi
4545
echo ' ---' `date`: Starting build
4646
echo ' ---' Kconfig fragment at: $config_template >> $resdir/log
47-
touch $resdir/ConfigFragment.input $resdir/ConfigFragment
47+
touch $resdir/ConfigFragment.input
4848
if test -r "$config_dir/CFcommon"
4949
then
5050
echo " --- $config_dir/CFcommon" >> $resdir/ConfigFragment.input
5151
cat < $config_dir/CFcommon >> $resdir/ConfigFragment.input
5252
config_override.sh $config_dir/CFcommon $config_template > $T/Kc1
53-
grep '#CHECK#' $config_dir/CFcommon >> $resdir/ConfigFragment
5453
else
5554
cp $config_template $T/Kc1
5655
fi
5756
echo " --- $config_template" >> $resdir/ConfigFragment.input
5857
cat $config_template >> $resdir/ConfigFragment.input
59-
grep '#CHECK#' $config_template >> $resdir/ConfigFragment
6058
if test -n "$TORTURE_KCONFIG_ARG"
6159
then
6260
echo $TORTURE_KCONFIG_ARG | tr -s " " "\012" > $T/cmdline
@@ -67,7 +65,7 @@ then
6765
else
6866
cp $T/Kc1 $T/Kc2
6967
fi
70-
cat $T/Kc2 >> $resdir/ConfigFragment
68+
cat $T/Kc2 > $resdir/ConfigFragment
7169

7270
base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'`
7371
if test "$base_resdir" != "$resdir" -a -f $base_resdir/bzImage -a -f $base_resdir/vmlinux

0 commit comments

Comments
 (0)