tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Zhouyi Zhou <zhouzhouyi@gmail.com>
Tested-by: Zhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

Paul E. McKenney a7d89cfb e31ccc1d

+19 -19
+2 -2
tools/testing/selftests/rcutorture/bin/kvm-again.sh
··· 47 47 exit 1 48 48 fi 49 49 50 - KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM 51 - PATH=${KVM}/bin:$PATH; export PATH 50 + RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE 51 + PATH=${RCUTORTURE}/bin:$PATH; export PATH 52 52 . functions.sh 53 53 54 54 dryrun=
+2 -2
tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh
··· 49 49 mkdir $resdir/$ds 50 50 echo Results directory: $resdir/$ds 51 51 52 - KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM 53 - PATH=${KVM}/bin:$PATH; export PATH 52 + RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE 53 + PATH=${RCUTORTURE}/bin:$PATH; export PATH 54 54 . functions.sh 55 55 echo Using all `identify_qemu_vcpus` CPUs. 56 56
+2 -2
tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh
··· 22 22 trap 'rm -rf $T' 0 23 23 mkdir $T 24 24 25 - KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM 26 - PATH=${KVM}/bin:$PATH; export PATH 25 + RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE 26 + PATH=${RCUTORTURE}/bin:$PATH; export PATH 27 27 . functions.sh 28 28 default_starttime="`get_starttime`" 29 29 starttime="${2-default_starttime}"
+4 -4
tools/testing/selftests/rcutorture/bin/kvm-remote.sh
··· 19 19 exit 1 20 20 fi 21 21 22 - KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM 23 - PATH=${KVM}/bin:$PATH; export PATH 22 + RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE 23 + PATH=${RCUTORTURE}/bin:$PATH; export PATH 24 24 . functions.sh 25 25 26 26 starttime="`get_starttime`" ··· 108 108 cat $T/kvm-again.sh.out | tee -a "$oldrun/remote-log" 109 109 exit 2 110 110 fi 111 - cp -a "$rundir" "$KVM/res/" 112 - oldrun="$KVM/res/$ds" 111 + cp -a "$rundir" "$RCUTORTURE/res/" 112 + oldrun="$RCUTORTURE/res/$ds" 113 113 fi 114 114 echo | tee -a "$oldrun/remote-log" 115 115 echo " ----" kvm-again.sh output: "(`date`)" | tee -a "$oldrun/remote-log"
+7 -7
tools/testing/selftests/rcutorture/bin/kvm.sh
··· 25 25 26 26 dur=$((30*60)) 27 27 dryrun="" 28 - KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM 29 - PATH=${KVM}/bin:$PATH; export PATH 28 + RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE 29 + PATH=${RCUTORTURE}/bin:$PATH; export PATH 30 30 . functions.sh 31 31 32 32 TORTURE_ALLOTED_CPUS="`identify_qemu_vcpus`" 33 33 TORTURE_DEFCONFIG=defconfig 34 34 TORTURE_BOOT_IMAGE="" 35 35 TORTURE_BUILDONLY= 36 - TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD 36 + TORTURE_INITRD="$RCUTORTURE/initrd"; export TORTURE_INITRD 37 37 TORTURE_KCONFIG_ARG="" 38 38 TORTURE_KCONFIG_GDB_ARG="" 39 39 TORTURE_BOOT_GDB_ARG="" ··· 262 262 exit 1 263 263 fi 264 264 265 - CONFIGFRAG=${KVM}/configs/${TORTURE_SUITE}; export CONFIGFRAG 265 + CONFIGFRAG=${RCUTORTURE}/configs/${TORTURE_SUITE}; export CONFIGFRAG 266 266 267 267 defaultconfigs="`tr '\012' ' ' < $CONFIGFRAG/CFLIST`" 268 268 if test -z "$configs" ··· 272 272 273 273 if test -z "$resdir" 274 274 then 275 - resdir=$KVM/res 275 + resdir=$RCUTORTURE/res 276 276 fi 277 277 278 278 # Create a file of test-name/#cpus pairs, sorted by decreasing #cpus. ··· 386 386 # Generate a script to execute the tests in appropriate batches. 387 387 cat << ___EOF___ > $T/script 388 388 CONFIGFRAG="$CONFIGFRAG"; export CONFIGFRAG 389 - KVM="$KVM"; export KVM 389 + RCUTORTURE="$RCUTORTURE"; export RCUTORTURE 390 390 PATH="$PATH"; export PATH 391 391 TORTURE_ALLOTED_CPUS="$TORTURE_ALLOTED_CPUS"; export TORTURE_ALLOTED_CPUS 392 392 TORTURE_BOOT_IMAGE="$TORTURE_BOOT_IMAGE"; export TORTURE_BOOT_IMAGE ··· 569 569 awk < $T/cfgcpu.pack \ 570 570 -v TORTURE_BUILDONLY="$TORTURE_BUILDONLY" \ 571 571 -v CONFIGDIR="$CONFIGFRAG/" \ 572 - -v KVM="$KVM" \ 572 + -v RCUTORTURE="$RCUTORTURE" \ 573 573 -v ncpus=$cpus \ 574 574 -v jitter="$jitter" \ 575 575 -v rd=$resdir/$ds/ \
+2 -2
tools/testing/selftests/rcutorture/bin/torture.sh
··· 13 13 scriptname=$0 14 14 args="$*" 15 15 16 - KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM 17 - PATH=${KVM}/bin:$PATH; export PATH 16 + RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE 17 + PATH=${RCUTORTURE}/bin:$PATH; export PATH 18 18 . functions.sh 19 19 20 20 TORTURE_ALLOTED_CPUS="`identify_qemu_vcpus`"