torture: Improve readability of the testid.txt file

The testid.txt file was intended for occasional in extremis use, but
now that the new "bare-metal" file references it, it might see more use.
This commit therefore labels sections of output and adds spacing to make
it easier to see what needs to be done to make a bare-metal build tree
match an rcutorture build tree.

Of course, you can avoid this whole issue by building your bare-metal
kernel in the same directory in which you ran rcutorture, but that might
not always be an option.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 35a2132a84611ad6aa4f80c1a94526ba8dbc388c..1de198d6f999b2e67c305973338eefbe3f109099 100755 (executable)
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -404,11 +404,16 @@ echo $scriptname $args
 touch $resdir/$ds/log
 echo $scriptname $args >> $resdir/$ds/log
 echo ${TORTURE_SUITE} > $resdir/$ds/TORTURE_SUITE
-pwd > $resdir/$ds/testid.txt
+echo Build directory: `pwd` > $resdir/$ds/testid.txt
 if test -d .git
 then
+       echo Current commit: `git rev-parse HEAD` >> $resdir/$ds/testid.txt
+       echo >> $resdir/$ds/testid.txt
+       echo ' ---' Output of "'"git status"'": >> $resdir/$ds/testid.txt
        git status >> $resdir/$ds/testid.txt
-       git rev-parse HEAD >> $resdir/$ds/testid.txt
+       echo >> $resdir/$ds/testid.txt
+       echo >> $resdir/$ds/testid.txt
+       echo ' ---' Output of "'"git diff HEAD"'": >> $resdir/$ds/testid.txt
        git diff HEAD >> $resdir/$ds/testid.txt
 fi
 ___EOF___