torture: Create kvm-check-branches.sh output in proper location

Currently, kvm-check-branches.sh causes each kvm.sh invocation create a
separate date-stamped directory, then after that invocation completes,
moves it into the *-group/NNNN directory.  This works, but makes it more
difficult to monitor an ongoing run.  This commit therefore uses the
kvm.sh --datestamp argument to make kvm.sh put the output in the right
place to start with, and also dispenses with the additional level of
datestamping.  (Those wanting datestamps can find them in the log files.)

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

diff --git a/tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh b/tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh
index f17000a..ed0ec7f 100755 (executable)
--- a/tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh
@@ -35,7 +35,7 @@ then
        exit 1
 fi
 
-# Remember where we started so that we can get back and the end.
+# Remember where we started so that we can get back at the end.
 curcommit="`git status | head -1 | awk '{ print $NF }'`"
 
 nfail=0
@@ -73,15 +73,10 @@ do
                # Test the specified commit.
                git checkout $i > $resdir/$ds/$idir/git-checkout.out 2>&1
                echo git checkout return code: $? "(Commit $ntry: $i)"
-               kvm.sh --allcpus --duration 3 --trust-make > $resdir/$ds/$idir/kvm.sh.out 2>&1
+               kvm.sh --allcpus --duration 3 --trust-make --datestamp "$ds/$idir" > $resdir/$ds/$idir/kvm.sh.out 2>&1
                ret=$?
                echo kvm.sh return code $ret for commit $i from branch $gitbr
-
-               # Move the build products to their resting place.
-               runresdir="`grep -m 1 '^Results directory:' < $resdir/$ds/$idir/kvm.sh.out | sed -e 's/^Results directory://'`"
-               mv $runresdir $resdir/$ds/$idir
-               rrd="`echo $runresdir | sed -e 's,^.*/,,'`"
-               echo Run results: $resdir/$ds/$idir/$rrd
+               echo Run results: $resdir/$ds/$idir
                if test "$ret" -ne 0
                then
                        # Failure, so leave all evidence intact.