aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-01-18 01:08:09 -0500
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-02-18 15:27:24 -0500
commitdf1cc81ba7ce80a681aa7f42cad0b9d93f677a6a (patch)
tree5e02cb91e8efa12ab2b0f8f53077e352b336cc1d
parent78ad0693233080169e5a01811bd3fcb3966f2d3f (diff)
rcutorture: Flag tests requiring more CPUs than are available
This commit adds a "(!)" flag after the number of CPUs required by a given test if that test requires more than the available number of CPUs. Note that these flags appear only when the number of CPUs is specified using the --cpus argument. In the absence of a --cpus argument, no tests are flagged. 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.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 7ef3b245c778..c099f8695112 100644
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -300,30 +300,34 @@ function dump(first, pastlast)
300 cfrep[cf[j]]++; 300 cfrep[cf[j]]++;
301 cfr[jn] = cf[j] "." cfrep[cf[j]]; 301 cfr[jn] = cf[j] "." cfrep[cf[j]];
302 } 302 }
303 print "echo ", cfr[jn], cpusr[jn] ": Starting build."; 303 if (cpusr[jn] > ncpus && ncpus != 0)
304 ovf = "(!)";
305 else
306 ovf = "";
307 print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build.";
304 print "rm -f " builddir ".*"; 308 print "rm -f " builddir ".*";
305 print "touch " builddir ".wait"; 309 print "touch " builddir ".wait";
306 print "mkdir " builddir " > /dev/null 2>&1 || :"; 310 print "mkdir " builddir " > /dev/null 2>&1 || :";
307 print "mkdir " rd cfr[jn] " || :"; 311 print "mkdir " rd cfr[jn] " || :";
308 print "kvm-test-1-rcu.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &" 312 print "kvm-test-1-rcu.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &"
309 print "echo ", cfr[jn], cpusr[jn] ": Waiting for build to complete." 313 print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete."
310 print "while test -f " builddir ".wait" 314 print "while test -f " builddir ".wait"
311 print "do" 315 print "do"
312 print "\tsleep 1" 316 print "\tsleep 1"
313 print "done" 317 print "done"
314 print "echo ", cfr[jn], cpusr[jn] ": Build complete." 318 print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete."
315 jn++; 319 jn++;
316 } 320 }
317 for (j = 1; j < jn; j++) { 321 for (j = 1; j < jn; j++) {
318 builddir=KVM "/b" j 322 builddir=KVM "/b" j
319 print "rm -f " builddir ".ready" 323 print "rm -f " builddir ".ready"
320 print "echo ----", cfr[j], cpusr[j] ": Starting kernel" 324 print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel"
321 } 325 }
322 print "wait" 326 print "wait"
323 print "echo ---- All kernel runs complete" 327 print "echo ---- All kernel runs complete"
324 for (j = 1; j < jn; j++) { 328 for (j = 1; j < jn; j++) {
325 builddir=KVM "/b" j 329 builddir=KVM "/b" j
326 print "echo ----", cfr[j], cpusr[j] ": Build/run results:" 330 print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:"
327 print "cat " builddir ".out" 331 print "cat " builddir ".out"
328 } 332 }
329} 333}