aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2016-09-27 14:56:12 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2016-11-14 13:48:59 -0500
commit1f32ee65864830e326aae5890780fa630423a8e9 (patch)
treea1dc1ef3aa76e7b7fd185200f817c2ac3ca6a600 /tools
parent31f19ed4f41f0717b9604d6aa6f6015355ebae2d (diff)
torture: Prevent jitter from delaying build-only runs
Currently, if the --jitter flag specifies jitter for a --build-only run, the system will obediently build a kernel, refuse to launch it, launch the requested number of jitter processes, and wait for the specified kernel run time, which defaults to 30 minutes. This is of course quite pointless. This commit therefore disables jitter on build-only runs. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/kvm.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 0aed965f0062..3b3c1b693ee1 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -303,6 +303,7 @@ then
303fi 303fi
304___EOF___ 304___EOF___
305awk < $T/cfgcpu.pack \ 305awk < $T/cfgcpu.pack \
306 -v TORTURE_BUILDONLY="$TORTURE_BUILDONLY" \
306 -v CONFIGDIR="$CONFIGFRAG/" \ 307 -v CONFIGDIR="$CONFIGFRAG/" \
307 -v KVM="$KVM" \ 308 -v KVM="$KVM" \
308 -v ncpus=$cpus \ 309 -v ncpus=$cpus \
@@ -375,6 +376,10 @@ function dump(first, pastlast, batchnum)
375 njitter = ncpus; 376 njitter = ncpus;
376 else 377 else
377 njitter = ja[1]; 378 njitter = ja[1];
379 if (TORTURE_BUILDONLY && njitter != 0) {
380 njitter = 0;
381 print "echo Build-only run, so suppressing jitter >> " rd "/log"
382 }
378 for (j = 0; j < njitter; j++) 383 for (j = 0; j < njitter; j++)
379 print "jitter.sh " j " " dur " " ja[2] " " ja[3] "&" 384 print "jitter.sh " j " " dur " " ja[2] " " ja[3] "&"
380 print "wait" 385 print "wait"