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

torture: Change KVM environment variable to RCUTORTURE 



The torture-test scripting's long-standing use of KVM as the environment
variable tracking the pathname of the rcutorture directory now conflicts
with allmodconfig builds due to the virt/kvm/Makefile.kvm file's use
of this as a makefile variable.  This commit therefore changes the
torture-test scripting from KVM to RCUTORTURE, avoiding the name conflict.

Reported-by: default avatarZhouyi Zhou <zhouzhouyi@gmail.com>
Tested-by: default avatarZhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent e31ccc1d

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

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ else 
	exit 1

fi



KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM

PATH=${KVM}/bin:$PATH; export PATH

RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE

PATH=${RCUTORTURE}/bin:$PATH; export PATH

. functions.sh



dryrun=

tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ fi 
mkdir $resdir/$ds

echo Results directory: $resdir/$ds



KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM

PATH=${KVM}/bin:$PATH; export PATH

RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE

PATH=${RCUTORTURE}/bin:$PATH; export PATH

. functions.sh

echo Using all `identify_qemu_vcpus` CPUs.

tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ T=${TMPDIR-/tmp}/kvm-end-run-stats.sh.$$ 
trap 'rm -rf $T' 0

mkdir $T



KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM

PATH=${KVM}/bin:$PATH; export PATH

RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE

PATH=${RCUTORTURE}/bin:$PATH; export PATH

. functions.sh

default_starttime="`get_starttime`"

starttime="${2-default_starttime}"

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

+4 −4
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ then 
	exit 1

fi



KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM

PATH=${KVM}/bin:$PATH; export PATH

RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE

PATH=${RCUTORTURE}/bin:$PATH; export PATH

. functions.sh



starttime="`get_starttime`"
@@ -108,8 +108,8 @@ else 
		cat $T/kvm-again.sh.out | tee -a "$oldrun/remote-log"

		exit 2

	fi

	cp -a "$rundir" "$KVM/res/"

	oldrun="$KVM/res/$ds"

	cp -a "$rundir" "$RCUTORTURE/res/"

	oldrun="$RCUTORTURE/res/$ds"

fi

echo | tee -a "$oldrun/remote-log"

echo " ----" kvm-again.sh output: "(`date`)" | tee -a "$oldrun/remote-log"

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

+7 −7
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ LANG=en_US.UTF-8; export LANG 


dur=$((30*60))

dryrun=""

KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM

PATH=${KVM}/bin:$PATH; export PATH

RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE

PATH=${RCUTORTURE}/bin:$PATH; export PATH

. functions.sh



TORTURE_ALLOTED_CPUS="`identify_qemu_vcpus`"

TORTURE_DEFCONFIG=defconfig

TORTURE_BOOT_IMAGE=""

TORTURE_BUILDONLY=

TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD

TORTURE_INITRD="$RCUTORTURE/initrd"; export TORTURE_INITRD

TORTURE_KCONFIG_ARG=""

TORTURE_KCONFIG_GDB_ARG=""

TORTURE_BOOT_GDB_ARG=""
@@ -262,7 +262,7 @@ else 
	exit 1

fi



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

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



defaultconfigs="`tr '\012' ' ' < $CONFIGFRAG/CFLIST`"

if test -z "$configs"
@@ -272,7 +272,7 @@ fi 


if test -z "$resdir"

then

	resdir=$KVM/res

	resdir=$RCUTORTURE/res

fi



# Create a file of test-name/#cpus pairs, sorted by decreasing #cpus.
@@ -386,7 +386,7 @@ END { 
# Generate a script to execute the tests in appropriate batches.

cat << ___EOF___ > $T/script

CONFIGFRAG="$CONFIGFRAG"; export CONFIGFRAG

KVM="$KVM"; export KVM

RCUTORTURE="$RCUTORTURE"; export RCUTORTURE

PATH="$PATH"; export PATH

TORTURE_ALLOTED_CPUS="$TORTURE_ALLOTED_CPUS"; export TORTURE_ALLOTED_CPUS

TORTURE_BOOT_IMAGE="$TORTURE_BOOT_IMAGE"; export TORTURE_BOOT_IMAGE
@@ -569,7 +569,7 @@ ___EOF___ 
awk < $T/cfgcpu.pack \

	-v TORTURE_BUILDONLY="$TORTURE_BUILDONLY" \

	-v CONFIGDIR="$CONFIGFRAG/" \

	-v KVM="$KVM" \

	-v RCUTORTURE="$RCUTORTURE" \

	-v ncpus=$cpus \

	-v jitter="$jitter" \

	-v rd=$resdir/$ds/ \