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>

diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 0aed965f0062848a0c9899ce94e8687dc3e1b338..3b3c1b693ee1f7dbb6ef255cd0996630bcf680ce 100755 (executable)
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -303,6 +303,7 @@ then
 fi
 ___EOF___
 awk < $T/cfgcpu.pack \
+       -v TORTURE_BUILDONLY="$TORTURE_BUILDONLY" \
        -v CONFIGDIR="$CONFIGFRAG/" \
        -v KVM="$KVM" \
        -v ncpus=$cpus \
@@ -375,6 +376,10 @@ function dump(first, pastlast, batchnum)
                njitter = ncpus;
        else
                njitter = ja[1];
+       if (TORTURE_BUILDONLY && njitter != 0) {
+               njitter = 0;
+               print "echo Build-only run, so suppressing jitter >> " rd "/log"
+       }
        for (j = 0; j < njitter; j++)
                print "jitter.sh " j " " dur " " ja[2] " " ja[3] "&"
        print "wait"