From f64fb746abe608c57ef40618f603f035d74e932f Mon Sep 17 00:00:00 2001 From: Dmitry Monakhov Date: Wed, 22 Feb 2017 13:48:13 +0400 Subject: [PATCH] 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- check | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/check b/check index 5a93c94e..5d7f75c4 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 -- 2.39.5