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: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>

diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh
index 41fb52b805e44f9bb298a494827c13f19f0eeb90..6b2adb29b073d15d821f5ef1a86be3258735f616 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/functions.sh
+++ b/tools/testing/selftests/rcutorture/bin/functions.sh
@@ -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

diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index ac06372b07556f5a30303d2c51be25fa2d13be18..41162012037b3ec7ef99e70b0f20274b6e8615d3 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -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" || :"