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

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

rcutorture: Introduce "rcu" directory level underneath configs 



This commit uses the standard software ploy of introducing another
level of indirection below the configs directory.  This allows each
torture-test suite to have its own set of Kconfig files, boot parameters,
and version-specific scripts.  Initially, we have only rcu, but lock
will follow soonish.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -199,5 +199,5 @@ then 
fi



cp $builddir/console.log $resdir

parse-rcutorture.sh $resdir/console.log $title

parse-${TORTURE_SUITE}torture.sh $resdir/console.log $title

parse-console.sh $resdir/console.log $title

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

+14 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ PATH=${KVM}/bin:$PATH; export PATH 
builddir="${KVM}/b1"

RCU_INITRD="$KVM/initrd"; export RCU_INITRD

RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG

TORTURE_SUITE=rcu

resdir=""

configs=""

cpus=0
@@ -66,8 +67,9 @@ usage () { 
	echo "       --no-initrd"

	echo "       --qemu-args qemu-system-..."

	echo "       --qemu-cmd qemu-system-..."

	echo "       --results absolute-pathname"

	echo "       --relbuilddir relative-pathname"

	echo "       --results absolute-pathname"

	echo "       --torture rcu"

	exit 1

}
@@ -156,6 +158,11 @@ do 
		resdir=$2

		shift

		;;

	--torture)

		checkarg --torture "(suite name)" "$#" "$2" '^rcu$' '^--'

		TORTURE_SUITE=$2

		shift

		;;

	*)

		echo Unknown argument $1

		usage
@@ -164,7 +171,7 @@ do 
	shift

done



CONFIGFRAG=${KVM}/configs; export CONFIGFRAG

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

KVPATH=${CONFIGFRAG}/$kversion; export KVPATH



if test -z "$configs"
@@ -191,6 +198,7 @@ then 


	touch $resdir/$ds/log

	echo $scriptname $args >> $resdir/$ds/log

	echo ${TORTURE_SUITE} > $resdir/$ds/TORTURE_SUITE



	pwd > $resdir/$ds/testid.txt

	if test -d .git
@@ -265,6 +273,9 @@ END { 
}'



# Generate a script to execute the tests in appropriate batches.

cat << ___EOF___ > $T/script

TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE

___EOF___

awk < $T/cfgcpu.pack \

	-v CONFIGDIR="$CONFIGFRAG/$kversion/" \

	-v KVM="$KVM" \
@@ -353,7 +364,7 @@ END { 
	# Dump the last batch.

	if (ncpus != 0)

		dump(first, i);

}' > $T/script

}' >> $T/script



if test "$dryrun" = script

then