aboutsummaryrefslogtreecommitdiffstats
path: root/check
diff options
context:
space:
mode:
authorDmitry Monakhov <dmonakhov@openvz.org>2017-02-22 13:48:13 +0400
committerEryu Guan <eguan@redhat.com>2017-02-22 18:01:52 +0800
commitf64fb746abe608c57ef40618f603f035d74e932f (patch)
tree471754c08bbb4eca51b7ecd6afb44e750675f33a /check
parent96bb374aa3313f60d739f81afbf2392d76ac4738 (diff)
downloadxfstests-dev-f64fb746abe608c57ef40618f603f035d74e932f.tar.gz
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>
Diffstat (limited to 'check')
-rwxr-xr-xcheck4
1 files changed, 3 insertions, 1 deletions
diff --git a/check b/check
index 5a93c94ed1..5d7f75c48f 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