Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

rcutorture: Create CFcommon file for common Kconfig parameters 



Currently, CONFIG_RCU_TORTURE_TEST=y is hardcoded into the
kvm-test-1-rcu.sh script and CONFIG_PRINTK_TIME=y is mentioned in each
and every configs file.  This commit creates a CFcommon file for these
two Kconfig parameters, and modifies kvm-test-1-rcu.sh to copy this new
file into the .config file during the build.  This change will allow
these scripts to operate on torture types other than just rcutorture.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent a1be00d9

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

+5 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ trap 'rm -rf $T' 0 
. $KVPATH/ver_functions.sh



config_template=${1}

config_dir=`echo $config_template | sed -e 's,/[^/]*$,,'`

title=`echo $config_template | sed -e 's/^.*\///'`

builddir=${2}

if test -z "$builddir" -o ! -d "$builddir" -o ! -w "$builddir"
@@ -63,9 +64,10 @@ fi 
cp $config_template $resdir/ConfigFragment

echo ' ---' `date`: Starting build

echo ' ---' Kconfig fragment at: $config_template >> $resdir/log

cat << '___EOF___' >> $T

CONFIG_RCU_TORTURE_TEST=y

___EOF___

if test -r "$config_dir/CFcommon"

then

	cat < $config_dir/CFcommon >> $T

fi

# Optimizations below this point

# CONFIG_USB=n

# CONFIG_SECURITY=n

tools/testing/selftests/rcutorture/configs/BUSTED

+0 −1
Original line number Diff line number Diff line
@@ -5,4 +5,3 @@ CONFIG_HOTPLUG_CPU=y 
CONFIG_PREEMPT_NONE=n

CONFIG_PREEMPT_VOLUNTARY=n

CONFIG_PREEMPT=y
 
CONFIG_PRINTK_TIME=y

tools/testing/selftests/rcutorture/configs/CFcommon

0 → 100644
+2 −0
Original line number Diff line number Diff line 
CONFIG_RCU_TORTURE_TEST=y

CONFIG_PRINTK_TIME=y

tools/testing/selftests/rcutorture/configs/SRCU-N

+0 −1
Original line number Diff line number Diff line
@@ -5,4 +5,3 @@ CONFIG_HOTPLUG_CPU=y 
CONFIG_PREEMPT_NONE=y

CONFIG_PREEMPT_VOLUNTARY=n

CONFIG_PREEMPT=n
 
CONFIG_PRINTK_TIME=y

tools/testing/selftests/rcutorture/configs/SRCU-P

+0 −1
Original line number Diff line number Diff line
@@ -5,4 +5,3 @@ CONFIG_HOTPLUG_CPU=y 
CONFIG_PREEMPT_NONE=n

CONFIG_PREEMPT_VOLUNTARY=n

CONFIG_PREEMPT=y
 
CONFIG_PRINTK_TIME=y