torture: Rename RCU_QEMU_MAC to TORTURE_QEMU_MAC

This commit makes the torture scripts a bit more RCU-independent.
It also drops an redundant "export" statement.

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 623939c..41fb52b 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/functions.sh
+++ b/tools/testing/selftests/rcutorture/bin/functions.sh
@@ -124,7 +124,7 @@ identify_qemu_append () {
 
 # identify_qemu_args qemu-cmd serial-file
 #
-# Output arguments for qemu arguments based on the RCU_QEMU_MAC
+# Output arguments for qemu arguments based on the TORTURE_QEMU_MAC
 # and TORTURE_QEMU_INTERACTIVE environment variables.
 identify_qemu_args () {
        case "$1" in
@@ -133,9 +133,9 @@ identify_qemu_args () {
        qemu-system-ppc64)
                echo -enable-kvm -M pseries -cpu POWER7 -nodefaults
                echo -device spapr-vscsi
-               if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$RCU_QEMU_MAC"
+               if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$TORTURE_QEMU_MAC"
                then
-                       echo -device spapr-vlan,netdev=net0,mac=$RCU_QEMU_MAC
+                       echo -device spapr-vlan,netdev=net0,mac=$TORTURE_QEMU_MAC
                        echo -netdev bridge,br=br0,id=net0
                elif test -n "$TORTURE_QEMU_INTERACTIVE"
                then

diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index c7d925b..886f97d 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -128,7 +128,7 @@ do
                ;;
        --mac)
                checkarg --mac "(MAC address)" $# "$2" '^\([0-9a-fA-F]\{2\}:\)\{5\}[0-9a-fA-F]\{2\}$' error
-               RCU_QEMU_MAC=$2; export RCU_QEMU_MAC
+               TORTURE_QEMU_MAC=$2
                shift
                ;;
        --no-initrd)
@@ -379,7 +379,7 @@ then
        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_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE; export TORTURE_QEMU_INTERACTIVE"
-       echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"
+       echo TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC; export TORTURE_QEMU_MAC"
        echo "mkdir -p "$resdir" || :"
        echo "mkdir $resdir/$ds"
        cat $T/script