torture: Remove obsolete builddir options

The --builddir and --relbuilddir options were initially intended to handle
parallel tests.  However, since commit 43e38ab3d518 (Enable concurrent
rcutorture runs), the script manages multiple build directories as
needed for parallel testing.  This commit therefore removes these two
obsolete options.

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/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 5a78cbf55f066dd3a657e9bfd210d4129e002f83..37a60ef70df3b5ab565d7b21e8dbc592795f3756 100644 (file)
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -38,7 +38,6 @@ 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_SUITE=rcu
@@ -53,7 +52,6 @@ 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"
@@ -67,7 +65,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
@@ -81,12 +78,6 @@ do
                RCU_BOOTARGS="$2"
                shift
                ;;
-       --builddir)
-               checkarg --builddir "(absolute pathname)" "$#" "$2" '^/' '^error'
-               builddir=$2
-               gotbuilddir=1
-               shift
-               ;;
        --buildonly)
                RCU_BUILDONLY=1; export RCU_BUILDONLY
                ;;
@@ -146,13 +137,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