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

torture: Rename RCU_QEMU_CMD to TORTURE_QEMU_CMD



This commit makes the torture scripts a bit more RCU-independent.
It also removes a redundant export of this same shell variable.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent d1b1e517
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -79,12 +79,12 @@ configfrag_hotplug_cpu () {
# identify_qemu builddir
#
# Returns our best guess as to which qemu command is appropriate for
# the kernel at hand.  Override with the RCU_QEMU_CMD environment variable.
# the kernel at hand.  Override with the TORTURE_QEMU_CMD environment variable.
identify_qemu () {
	local u="`file "$1"`"
	if test -n "$RCU_QEMU_CMD"
	if test -n "$TORTURE_QEMU_CMD"
	then
		echo $RCU_QEMU_CMD
		echo $TORTURE_QEMU_CMD
	elif echo $u | grep -q x86-64
	then
		echo qemu-system-x86_64
@@ -98,7 +98,7 @@ identify_qemu () {
		echo Cannot figure out what qemu command to use! 1>&2
		echo file $1 output: $u
		# Usually this will be one of /usr/bin/qemu-system-*
		# Use RCU_QEMU_CMD environment variable or appropriate
		# Use TORTURE_QEMU_CMD environment variable or appropriate
		# argument to top-level script.
		exit 1
	fi
+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ do
		;;
	--qemu-cmd)
		checkarg --qemu-cmd "(qemu-system-...)" $# "$2" 'qemu-system-' '^--'
		RCU_QEMU_CMD="$2"; export RCU_QEMU_CMD
		TORTURE_QEMU_CMD="$2"
		shift
		;;
	--results)
@@ -377,7 +377,7 @@ then
	echo TORTURE_BUILDONLY="$TORTURE_BUILDONLY; export TORTURE_BUILDONLY"
	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
	echo TORTURE_QEMU_CMD="$TORTURE_QEMU_CMD; export TORTURE_QEMU_CMD"
	echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE; export TORTURE_QEMU_INTERACTIVE"
	echo TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC; export TORTURE_QEMU_MAC"
	echo "mkdir -p "$resdir" || :"