From 0beb394878a46bad6358f81dde2ef4aa0ef68af5 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Thu, 26 Nov 2020 15:27:57 -0800 Subject: [PATCH] torture: Add kvm.sh test summary to end of log file This commit adds the test summary to the end of the log in the top-level directory containing the kvm.sh test artifacts. While in the area, it adds the kvm.sh exit code to this test summary. Signed-off-by: Paul E. McKenney --- tools/testing/selftests/rcutorture/bin/kvm.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index 472929cb8312e..667896f9c0d47 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 -- 2.30.2