torture: Rename RCU_BUILDONLY to TORTURE_BUILDONLY

[deliverable/linux.git] / tools / testing / selftests / rcutorture / bin / kvm.sh

diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 59945b7793d9694efef9d6f96942f8ff01ee5156..73c586f6bdf6dcb10d86c817a3da2fcf635532a2 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -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=""
@@ -77,11 +77,11 @@ do
        case "$1" in
        --bootargs)
                checkarg --bootargs "(list of kernel boot arguments)" "$#" "$2" '.*' '^--'
-               RCU_BOOTARGS="$2"
+               TORTURE_BOOTARGS="$2"
                shift
                ;;
        --buildonly)
-               RCU_BUILDONLY=1; export RCU_BUILDONLY
+               TORTURE_BUILDONLY=1
                ;;
        --configs)
                checkarg --configs "(list of config files)" "$#" "$2" '^[^/]*$' '^--'
@@ -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)
@@ -275,7 +275,7 @@ awk < $T/cfgcpu.pack \
        -v rd=$resdir/$ds/ \
        -v dur=$dur \
        -v RCU_QEMU_ARG=$RCU_QEMU_ARG \
-       -v RCU_BOOTARGS=$RCU_BOOTARGS \
+       -v TORTURE_BOOTARGS=$TORTURE_BOOTARGS \
 'BEGIN {
        i = 0;
 }
@@ -312,7 +312,7 @@ function dump(first, pastlast)
                print "touch " builddir ".wait";
                print "mkdir " builddir " > /dev/null 2>&1 || :";
                print "mkdir " rd cfr[jn] " || :";
-               print "kvm-test-1-run.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " rd cfr[jn]  "/kvm-test-1-run.sh.out 2>&1 &"
+               print "kvm-test-1-run.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" TORTURE_BOOTARGS "\" > " rd cfr[jn]  "/kvm-test-1-run.sh.out 2>&1 &"
                print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`";
                print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date` >> " rd "/log";
                print "while test -f " builddir ".wait"
@@ -374,9 +374,9 @@ then
        echo KVM="$KVM; export KVM"
        echo KVPATH="$KVPATH; export KVPATH"
        echo PATH="$PATH; export PATH"
-       echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"
+       echo TORTURE_BUILDONLY="$TORTURE_BUILDONLY; export TORTURE_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"
@@ -402,4 +402,7 @@ echo
 echo
 echo " --- `date` Test summary:"
 echo Results directory: $resdir/$ds
-kvm-recheck.sh $resdir/$ds
+if test -n "$TORTURE_BUILDONLY"
+then
+       kvm-recheck.sh $resdir/$ds
+fi