diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-02-26 11:56:57 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-05-13 20:02:33 -0400 |
commit | f7ff6e6cf508779c64c5624e1ba0b7fde5036da1 (patch) | |
tree | f6a26087bd09ccf98d18d19085ffc331d8bf5ec3 /tools/testing | |
parent | ad0dc7f94dbf417b1c7d42e1f0b250f045b27f8f (diff) |
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>
Diffstat (limited to 'tools/testing')
-rw-r--r-- | tools/testing/selftests/rcutorture/bin/kvm.sh | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index 5a78cbf55f06..37a60ef70df3 100644 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh | |||
@@ -38,7 +38,6 @@ dur=30 | |||
38 | dryrun="" | 38 | dryrun="" |
39 | KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM | 39 | KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM |
40 | PATH=${KVM}/bin:$PATH; export PATH | 40 | PATH=${KVM}/bin:$PATH; export PATH |
41 | builddir="${KVM}/b1" | ||
42 | RCU_INITRD="$KVM/initrd"; export RCU_INITRD | 41 | RCU_INITRD="$KVM/initrd"; export RCU_INITRD |
43 | RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG | 42 | RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG |
44 | TORTURE_SUITE=rcu | 43 | TORTURE_SUITE=rcu |
@@ -53,7 +52,6 @@ kversion="" | |||
53 | usage () { | 52 | usage () { |
54 | echo "Usage: $scriptname optional arguments:" | 53 | echo "Usage: $scriptname optional arguments:" |
55 | echo " --bootargs kernel-boot-arguments" | 54 | echo " --bootargs kernel-boot-arguments" |
56 | echo " --builddir absolute-pathname" | ||
57 | echo " --buildonly" | 55 | echo " --buildonly" |
58 | echo " --configs \"config-file list\"" | 56 | echo " --configs \"config-file list\"" |
59 | echo " --cpus N" | 57 | echo " --cpus N" |
@@ -67,7 +65,6 @@ usage () { | |||
67 | echo " --no-initrd" | 65 | echo " --no-initrd" |
68 | echo " --qemu-args qemu-system-..." | 66 | echo " --qemu-args qemu-system-..." |
69 | echo " --qemu-cmd qemu-system-..." | 67 | echo " --qemu-cmd qemu-system-..." |
70 | echo " --relbuilddir relative-pathname" | ||
71 | echo " --results absolute-pathname" | 68 | echo " --results absolute-pathname" |
72 | echo " --torture rcu" | 69 | echo " --torture rcu" |
73 | exit 1 | 70 | exit 1 |
@@ -81,12 +78,6 @@ do | |||
81 | RCU_BOOTARGS="$2" | 78 | RCU_BOOTARGS="$2" |
82 | shift | 79 | shift |
83 | ;; | 80 | ;; |
84 | --builddir) | ||
85 | checkarg --builddir "(absolute pathname)" "$#" "$2" '^/' '^error' | ||
86 | builddir=$2 | ||
87 | gotbuilddir=1 | ||
88 | shift | ||
89 | ;; | ||
90 | --buildonly) | 81 | --buildonly) |
91 | RCU_BUILDONLY=1; export RCU_BUILDONLY | 82 | RCU_BUILDONLY=1; export RCU_BUILDONLY |
92 | ;; | 83 | ;; |
@@ -146,13 +137,6 @@ do | |||
146 | RCU_QEMU_CMD="$2"; export RCU_QEMU_CMD | 137 | RCU_QEMU_CMD="$2"; export RCU_QEMU_CMD |
147 | shift | 138 | shift |
148 | ;; | 139 | ;; |
149 | --relbuilddir) | ||
150 | checkarg --relbuilddir "(relative pathname)" "$#" "$2" '^[^/]*$' '^--' | ||
151 | relbuilddir=$2 | ||
152 | gotrelbuilddir=1 | ||
153 | builddir=${KVM}/${relbuilddir} | ||
154 | shift | ||
155 | ;; | ||
156 | --results) | 140 | --results) |
157 | checkarg --results "(absolute pathname)" "$#" "$2" '^/' '^error' | 141 | checkarg --results "(absolute pathname)" "$#" "$2" '^/' '^error' |
158 | resdir=$2 | 142 | resdir=$2 |