aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-02-11 15:16:14 -0500
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-02-23 12:04:44 -0500
commit73fa867e2c705cf5cf0a38df8618fa20eee3d75a (patch)
tree313d11060399927ac5ce7f76aa76a595fe489e25 /tools/testing/selftests
parente086481baf9d0436bdd6e9b739bfa4a83fb89ef5 (diff)
rcutorture: Save kvm.sh output to log
This commit logs the progress text that kvm.sh outputs, improving after-the-fact troubleshooting. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'tools/testing/selftests')
-rw-r--r--tools/testing/selftests/rcutorture/bin/kvm.sh22
1 files changed, 15 insertions, 7 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 48b27e9716ae..5a78cbf55f06 100644
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -297,7 +297,8 @@ awk < $T/cfgcpu.pack \
297# Dump out the scripting required to run one test batch. 297# Dump out the scripting required to run one test batch.
298function dump(first, pastlast) 298function dump(first, pastlast)
299{ 299{
300 print "echo ----Start batch: `date`" 300 print "echo ----Start batch: `date`";
301 print "echo ----Start batch: `date` >> " rd "/log";
301 jn=1 302 jn=1
302 for (j = first; j < pastlast; j++) { 303 for (j = first; j < pastlast; j++) {
303 builddir=KVM "/b" jn 304 builddir=KVM "/b" jn
@@ -314,30 +315,37 @@ function dump(first, pastlast)
314 else 315 else
315 ovf = ""; 316 ovf = "";
316 print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build. `date`"; 317 print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build. `date`";
318 print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build. `date` >> " rd "/log";
317 print "rm -f " builddir ".*"; 319 print "rm -f " builddir ".*";
318 print "touch " builddir ".wait"; 320 print "touch " builddir ".wait";
319 print "mkdir " builddir " > /dev/null 2>&1 || :"; 321 print "mkdir " builddir " > /dev/null 2>&1 || :";
320 print "mkdir " rd cfr[jn] " || :"; 322 print "mkdir " rd cfr[jn] " || :";
321 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 &" 323 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 &"
322 print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`" 324 print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`";
325 print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date` >> " rd "/log";
323 print "while test -f " builddir ".wait" 326 print "while test -f " builddir ".wait"
324 print "do" 327 print "do"
325 print "\tsleep 1" 328 print "\tsleep 1"
326 print "done" 329 print "done"
327 print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date`" 330 print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date`";
331 print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date` >> " rd "/log";
328 jn++; 332 jn++;
329 } 333 }
330 for (j = 1; j < jn; j++) { 334 for (j = 1; j < jn; j++) {
331 builddir=KVM "/b" j 335 builddir=KVM "/b" j
332 print "rm -f " builddir ".ready" 336 print "rm -f " builddir ".ready"
333 print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date`" 337 print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date`";
338 print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date` >> " rd "/log";
334 } 339 }
335 print "wait" 340 print "wait"
336 print "echo ---- All kernel runs complete. `date`" 341 print "echo ---- All kernel runs complete. `date`";
342 print "echo ---- All kernel runs complete. `date` >> " rd "/log";
337 for (j = 1; j < jn; j++) { 343 for (j = 1; j < jn; j++) {
338 builddir=KVM "/b" j 344 builddir=KVM "/b" j
339 print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:" 345 print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:";
340 print "cat " rd cfr[j] "/kvm-test-1-run.sh.out" 346 print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results: >> " rd "/log";
347 print "cat " rd cfr[j] "/kvm-test-1-run.sh.out";
348 print "cat " rd cfr[j] "/kvm-test-1-run.sh.out >> " rd "/log";
341 } 349 }
342} 350}
343 351