4 files changed, 21 insertions, 8 deletions

diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh
index 829186e19eb1..7f1ff1a8fc4b 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh
@@ -35,7 +35,7 @@ configfile=`echo $i | sed -e 's/^.*\///'`
 ncs=`grep "Writes:  Total:" $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* Total: //' -e 's/ .*$//'`
 if test -z "$ncs"
 then
-        echo $configfile
+        echo "$configfile -------"
 else
         title="$configfile ------- $ncs acquisitions/releases"
         dur=`sed -e 's/^.* locktorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null`
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
index d75b1dc5ae53..307c4b95f325 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
@@ -35,7 +35,7 @@ configfile=`echo $i | sed -e 's/^.*\///'`
 ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'`
 if test -z "$ngps"
 then
-        echo $configfile
+        echo "$configfile -------"
 else
         title="$configfile ------- $ngps grace periods"
         dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null`
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
index 26d78b7eaccf..ee1f6cae3d70 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
@@ -25,6 +25,7 @@
 # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
 
 PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH
+. tools/testing/selftests/rcutorture/bin/functions.sh
 for rd in "$@"
 do
         firsttime=1
@@ -39,13 +40,24 @@ do
                 fi
                 TORTURE_SUITE="`cat $i/../TORTURE_SUITE`"
                 kvm-recheck-${TORTURE_SUITE}.sh $i
-                configcheck.sh $i/.config $i/ConfigFragment
-                parse-build.sh $i/Make.out $configfile
-                parse-torture.sh $i/console.log $configfile
-                parse-console.sh $i/console.log $configfile
-                if test -r $i/Warnings
+                if test -f "$i/console.log"
                 then
-                        cat $i/Warnings
+                        configcheck.sh $i/.config $i/ConfigFragment
+                        parse-build.sh $i/Make.out $configfile
+                        parse-torture.sh $i/console.log $configfile
+                        parse-console.sh $i/console.log $configfile
+                        if test -r $i/Warnings
+                        then
+                                cat $i/Warnings
+                        fi
+                else
+                        if test -f "$i/qemu-cmd"
+                        then
+                                print_bug qemu failed
+                        else
+                                print_bug Build failed
+                        fi
+                        echo "   $i"
                 fi
         done
 done
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
index 2301982b8087..2bfdb48cd920 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
@@ -112,6 +112,7 @@ then
         fi
 else
         cp $builddir/Make*.out $resdir
+        cp $builddir/.config $resdir || :
         echo Build failed, not running KVM, see $resdir.
         if test -f $builddir.wait
         then