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

torture: Rename RCU_INITRD to TORTURE_INITRD 



This commit makes the torture scripts a bit more RCU-independent.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ mkdir $T 


cat ${config_template} | grep -v CONFIG_RCU_TORTURE_TEST > $T/config

cat << ___EOF___ >> $T/config

CONFIG_INITRAMFS_SOURCE="$RCU_INITRD"

CONFIG_INITRAMFS_SOURCE="$TORTURE_INITRD"

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_CONSOLE=y

___EOF___

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

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ dur=30 
dryrun=""

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

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

RCU_INITRD="$KVM/initrd"; export RCU_INITRD

TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD

RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG

TORTURE_SUITE=rcu

resdir=""
@@ -125,7 +125,7 @@ do 
		shift

		;;

	--no-initrd)

		RCU_INITRD=""; export RCU_INITRD

		TORTURE_INITRD=""; export TORTURE_INITRD

		;;

	--qemu-args)

		checkarg --qemu-args "-qemu args" $# "$2" '^-' '^error'
@@ -367,7 +367,7 @@ then 
	echo KVPATH="$KVPATH; export KVPATH"

	echo PATH="$PATH; export PATH"

	echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"

	echo RCU_INITRD="$RCU_INITRD; export RCU_INITRD"

	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"

	echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG"

	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"

	echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE"