check: fix incorrect interrupt detection

Currently "Interrupted!" string always appeared in check.log because
flag cleared at very end after summary was dumped already.  It looks
very strange, but it was broken from very beginning 27fba05e
(2001-01-15)

- update interrupt flag at the end of a section loop, but before _wrapup
- dump 'Interrupted' to stdout

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Dmitry Monakhov
2017-02-22 13:48:13 +04:00
committed by Eryu Guan
parent 96bb374aa3
commit f64fb746ab
+3 -1
View File
@@ -405,7 +405,7 @@ _wrapup()
echo "Ran:$try" >>$check.log
fi
$interrupt && echo "Interrupted!" >>$check.log
$interrupt && echo "Interrupted!" | tee -a $check.log
if [ ! -z "$notrun" ]; then
if [ $brief_test_summary == "false" ]; then
@@ -755,7 +755,9 @@ for section in $HOST_OPTIONS_SECTIONS; do
seq="after_$seqnum"
done
interrupt=false
_wrapup
interrupt=true
echo
_test_unmount 2> /dev/null