diff options
| -rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm.sh | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index 472929cb8312..667896f9c0d4 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh @@ -527,15 +527,18 @@ END { }' >> $T/script cat << '___EOF___' >> $T/script -echo -echo -echo " --- `date` Test summary:" +echo | tee -a $TORTURE_RESDIR/log +echo | tee -a $TORTURE_RESDIR/log +echo " --- `date` Test summary:" | tee -a $TORTURE_RESDIR/log ___EOF___ cat << ___EOF___ >> $T/script -echo Results directory: $resdir/$ds -kcsan-collapse.sh $resdir/$ds -kvm-recheck.sh $resdir/$ds +echo Results directory: $resdir/$ds | tee -a $resdir/$ds/log +kcsan-collapse.sh $resdir/$ds | tee -a $resdir/$ds/log +kvm-recheck.sh $resdir/$ds > $T/kvm-recheck.sh.out 2>&1 ___EOF___ +echo 'ret=$?' >> $T/script +echo "cat $T/kvm-recheck.sh.out | tee -a $resdir/$ds/log" >> $T/script +echo 'exit $ret' >> $T/script if test "$dryrun" = script then @@ -556,9 +559,9 @@ then exit 0 else # Not a dryrun, so run the script. - sh $T/script + bash $T/script ret=$? - echo " --- Done at `date` (`get_starttime_duration $starttime`)" + echo " --- Done at `date` (`get_starttime_duration $starttime`) exitcode $ret" | tee -a $resdir/$ds/log exit $ret fi |