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

torture: Rename RCU_KMAKE_ARG to TORTURE_KMAKE_ARG 



This commit makes the torture scripts a bit more RCU-independent by
changing RCU_KMAKE_ARG to TORTURE_KMAKE_ARG.  It also removes the
unnecessary export command.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ then 
	exit 2

fi

ncpus=`cpus2use.sh`

make O=$builddir -j$ncpus $RCU_KMAKE_ARG > $builddir/Make.out 2>&1

make O=$builddir -j$ncpus $TORTURE_KMAKE_ARG > $builddir/Make.out 2>&1

retval=$?

if test $retval -ne 0 || grep "rcu[^/]*": < $builddir/Make.out | egrep -q "Stop|Error|error:|warning:" || egrep -q "Stop|Error|error:" < $builddir/Make.out

then

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

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM 
PATH=${KVM}/bin:$PATH; export PATH

TORTURE_DEFCONFIG=defconfig

TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD

RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG

TORTURE_KMAKE_ARG=""

TORTURE_SUITE=rcu

resdir=""

configs=""
@@ -118,7 +118,7 @@ do 
		;;

	--kmake-arg)

		checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$'

		RCU_KMAKE_ARG="$2"; export RCU_KMAKE_ARG

		TORTURE_KMAKE_ARG="$2"

		shift

		;;

	--kversion)
@@ -376,7 +376,7 @@ then 
	echo PATH="$PATH; export PATH"

	echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"

	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"

	echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG"

	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"

	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"

	echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE"

	echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"