diff mbox

check: fix incorrect interrupt detection

Message ID 1487756893-27717-1-git-send-email-dmonakhov@openvz.org (mailing list archive)
State New, archived
Headers show

Commit Message

Dmitry Monakhov Feb. 22, 2017, 9:48 a.m. UTC
Currently "Interrupted!" string always appeared in check.log because
flag cleared at very end after summary was dumped already.
It looks strange 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>
---
 check | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/check b/check
index 5a93c94..5d7f75c 100755
--- a/check
+++ b/check
@@ -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