aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-02-26 18:28:53 -0500
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-05-14 12:45:44 -0400
commit98bc8cc8715e814c3cd63040f08876ce7347e9d2 (patch)
treefee67d0e37c5293db5cefa6dca295b2a4fc88fe4
parent58d280bd704b4cf8cbb3ae3fb7849c07601d0568 (diff)
torture: Rename RCU_BOOTARGS to TORTURE_BOOTARGS
This commit makes the torture scripts a bit more RCU-independent. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r--tools/testing/selftests/rcutorture/bin/kvm.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 04ad1f980dfe..08c90cba79d2 100644
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -77,7 +77,7 @@ do
77 case "$1" in 77 case "$1" in
78 --bootargs) 78 --bootargs)
79 checkarg --bootargs "(list of kernel boot arguments)" "$#" "$2" '.*' '^--' 79 checkarg --bootargs "(list of kernel boot arguments)" "$#" "$2" '.*' '^--'
80 RCU_BOOTARGS="$2" 80 TORTURE_BOOTARGS="$2"
81 shift 81 shift
82 ;; 82 ;;
83 --buildonly) 83 --buildonly)
@@ -275,7 +275,7 @@ awk < $T/cfgcpu.pack \
275 -v rd=$resdir/$ds/ \ 275 -v rd=$resdir/$ds/ \
276 -v dur=$dur \ 276 -v dur=$dur \
277 -v RCU_QEMU_ARG=$RCU_QEMU_ARG \ 277 -v RCU_QEMU_ARG=$RCU_QEMU_ARG \
278 -v RCU_BOOTARGS=$RCU_BOOTARGS \ 278 -v TORTURE_BOOTARGS=$TORTURE_BOOTARGS \
279'BEGIN { 279'BEGIN {
280 i = 0; 280 i = 0;
281} 281}
@@ -312,7 +312,7 @@ function dump(first, pastlast)
312 print "touch " builddir ".wait"; 312 print "touch " builddir ".wait";
313 print "mkdir " builddir " > /dev/null 2>&1 || :"; 313 print "mkdir " builddir " > /dev/null 2>&1 || :";
314 print "mkdir " rd cfr[jn] " || :"; 314 print "mkdir " rd cfr[jn] " || :";
315 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 &" 315 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 &"
316 print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`"; 316 print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`";
317 print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date` >> " rd "/log"; 317 print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date` >> " rd "/log";
318 print "while test -f " builddir ".wait" 318 print "while test -f " builddir ".wait"