aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-02-26 19:42:46 -0500
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-05-14 12:45:49 -0400
commitd1b1e5170c2bba2fcf089277c59259058597254c (patch)
treea1547a70833b96b1fb2c3451030ce33e8cdcf445 /tools/testing
parent58f724f741716b9321664f0d2d2d9cef91fb46f4 (diff)
torture: Rename RCU_QEMU_ARG to TORTURE_QEMU_ARG
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>
Diffstat (limited to 'tools/testing')
-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 886f97d28784..ac06372b0755 100644
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -136,7 +136,7 @@ do
136 ;; 136 ;;
137 --qemu-args) 137 --qemu-args)
138 checkarg --qemu-args "-qemu args" $# "$2" '^-' '^error' 138 checkarg --qemu-args "-qemu args" $# "$2" '^-' '^error'
139 RCU_QEMU_ARG="$2" 139 TORTURE_QEMU_ARG="$2"
140 shift 140 shift
141 ;; 141 ;;
142 --qemu-cmd) 142 --qemu-cmd)
@@ -274,7 +274,7 @@ awk < $T/cfgcpu.pack \
274 -v ncpus=$cpus \ 274 -v ncpus=$cpus \
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 TORTURE_QEMU_ARG=$TORTURE_QEMU_ARG \
278 -v TORTURE_BOOTARGS=$TORTURE_BOOTARGS \ 278 -v TORTURE_BOOTARGS=$TORTURE_BOOTARGS \
279'BEGIN { 279'BEGIN {
280 i = 0; 280 i = 0;
@@ -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 "\" \"" TORTURE_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 " \"" TORTURE_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"