torture: Properly redirect kvm-remote.sh "echo" commands

The echo commands following initialization of the "oldrun" variable need
to be "tee"d to $oldrun/remote-log.  This commit fixes several stragglers.

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

diff --git a/tools/testing/selftests/rcutorture/bin/kvm-remote.sh b/tools/testing/selftests/rcutorture/bin/kvm-remote.sh
index 7ab79b0d5ad198df8da1f4584290a23863159a91..e09b1bc787084f0d78d000c4997305a759d7b359 100755 (executable)
--- a/tools/testing/selftests/rcutorture/bin/kvm-remote.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-remote.sh
@@ -184,16 +184,16 @@ checkremotefile () {
                ret=$?
                if test "$ret" -eq 255
                then
-                       echo " ---" ssh failure to $1 checking for file $2, retry after $sleeptime seconds. `date`
+                       echo " ---" ssh failure to $1 checking for file $2, retry after $sleeptime seconds. `date` | tee -a "$oldrun/remote-log"
                elif test "$ret" -eq 0
                then
                        return 0
                elif test "$ret" -eq 1
                then
-                       echo " ---" File \"$2\" not found: ssh $1 test -f \"$2\"
+                       echo " ---" File \"$2\" not found: ssh $1 test -f \"$2\" | tee -a "$oldrun/remote-log"
                        return 1
                else
-                       echo " ---" Exit code $ret: ssh $1 test -f \"$2\", retry after $sleeptime seconds. `date`
+                       echo " ---" Exit code $ret: ssh $1 test -f \"$2\", retry after $sleeptime seconds. `date` | tee -a "$oldrun/remote-log"
                        return $ret
                fi
                sleep $sleeptime
@@ -252,7 +252,7 @@ do
                sleep 30
        fi
 done
-echo All batches started. `date`
+echo All batches started. `date` | tee -a "$oldrun/remote-log"
 
 # Wait for all remaining scenarios to complete and collect results.
 for i in $systems
@@ -261,7 +261,7 @@ do
        do
                sleep 30
        done
-       echo " ---" Collecting results from $i `date`
+       echo " ---" Collecting results from $i `date` | tee -a "$oldrun/remote-log"
        ( cd "$oldrun"; ssh $i "cd $rundir; tar -czf - kvm-remote-*.sh.out */console.log */kvm-test-1-run*.sh.out */qemu[_-]pid */qemu-retval */qemu-affinity; rm -rf $T > /dev/null 2>&1" | tar -xzf - )
 done