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 5a78cbf55f066dd3a657e9bfd210d4129e002f83..73c586f6bdf6dcb10d86c817a3da2fcf635532a2 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -38,9 +38,9 @@ dur=30
 dryrun=""
 KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
 PATH=${KVM}/bin:$PATH; export PATH
-builddir="${KVM}/b1"
-RCU_INITRD="$KVM/initrd"; export RCU_INITRD
-RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
+TORTURE_DEFCONFIG=defconfig
+TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
+TORTURE_KMAKE_ARG=""
 TORTURE_SUITE=rcu
 resdir=""
 configs=""
@@ -53,11 +53,11 @@ kversion=""
 usage () {
        echo "Usage: $scriptname optional arguments:"
        echo "       --bootargs kernel-boot-arguments"
-       echo "       --builddir absolute-pathname"
        echo "       --buildonly"
        echo "       --configs \"config-file list\""
        echo "       --cpus N"
        echo "       --datestamp string"
+       echo "       --defconfig string"
        echo "       --dryrun sched|script"
        echo "       --duration minutes"
        echo "       --interactive"
@@ -67,7 +67,6 @@ usage () {
        echo "       --no-initrd"
        echo "       --qemu-args qemu-system-..."
        echo "       --qemu-cmd qemu-system-..."
-       echo "       --relbuilddir relative-pathname"
        echo "       --results absolute-pathname"
        echo "       --torture rcu"
        exit 1
@@ -78,17 +77,11 @@ do
        case "$1" in
        --bootargs)
                checkarg --bootargs "(list of kernel boot arguments)" "$#" "$2" '.*' '^--'
-               RCU_BOOTARGS="$2"
-               shift
-               ;;
-       --builddir)
-               checkarg --builddir "(absolute pathname)" "$#" "$2" '^/' '^error'
-               builddir=$2
-               gotbuilddir=1
+               TORTURE_BOOTARGS="$2"
                shift
                ;;
        --buildonly)
-               RCU_BUILDONLY=1; export RCU_BUILDONLY
+               TORTURE_BUILDONLY=1
                ;;
        --configs)
                checkarg --configs "(list of config files)" "$#" "$2" '^[^/]*$' '^--'
@@ -105,6 +98,11 @@ do
                ds=$2
                shift
                ;;
+       --defconfig)
+               checkarg --defconfig "defconfigtype" "$#" "$2" '^[^/][^/]*$' '^--'
+               TORTURE_DEFCONFIG=$2
+               shift
+               ;;
        --dryrun)
                checkarg --dryrun "sched|script" $# "$2" 'sched\|script' '^--'
                dryrun=$2
@@ -120,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)
@@ -134,7 +132,7 @@ do
                shift
                ;;
        --no-initrd)
-               RCU_INITRD=""; export RCU_INITRD
+               TORTURE_INITRD=""; export TORTURE_INITRD
                ;;
        --qemu-args)
                checkarg --qemu-args "-qemu args" $# "$2" '^-' '^error'
@@ -146,13 +144,6 @@ do
                RCU_QEMU_CMD="$2"; export RCU_QEMU_CMD
                shift
                ;;
-       --relbuilddir)
-               checkarg --relbuilddir "(relative pathname)" "$#" "$2" '^[^/]*$' '^--'
-               relbuilddir=$2
-               gotrelbuilddir=1
-               builddir=${KVM}/${relbuilddir}
-               shift
-               ;;
        --results)
                checkarg --results "(absolute pathname)" "$#" "$2" '^/' '^error'
                resdir=$2
@@ -275,6 +266,7 @@ END {
 # Generate a script to execute the tests in appropriate batches.
 cat << ___EOF___ > $T/script
 TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
+TORTURE_DEFCONFIG="$TORTURE_DEFCONFIG"; export TORTURE_DEFCONFIG
 ___EOF___
 awk < $T/cfgcpu.pack \
        -v CONFIGDIR="$CONFIGFRAG/$kversion/" \
@@ -283,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;
 }
@@ -320,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"
@@ -382,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 RCU_INITRD="$RCU_INITRD; export RCU_INITRD"
-       echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG"
+       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 RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE"
        echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"
@@ -395,7 +387,8 @@ then
 elif test "$dryrun" = sched
 then
        # Extract the test run schedule from the script.
-       egrep 'start batch|Starting build\.' $T/script |
+       egrep 'Start batch|Starting build\.' $T/script |
+               grep -v ">>" |
                sed -e 's/:.*$//' -e 's/^echo //'
        exit 0
 else
@@ -409,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