X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=tests%2Futils%2Futils.sh;h=57e90fce9012ba10a8bee7290fc7a30aa7bf16bb;hb=c70fe895864e27ac4426ee2e92d5c9f168d0325a;hp=5de6d26a896024e3c205cdd7cbe64f03a5284fcd;hpb=ad7b9fd5ca4ce1016a1e4703b07a0fdd865e5178;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 5de6d26a8..57e90fce9 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -46,7 +46,7 @@ export LTTNG_SESSIOND_PATH="/bin/true"
 
 source $TESTDIR/utils/tap/tap.sh
 
-if [ -z $LTTNG_TEST_TEARDOWN_TIMEOUT ]; then
+if [ -z ${LTTNG_TEST_TEARDOWN_TIMEOUT+x} ]; then
 	LTTNG_TEST_TEARDOWN_TIMEOUT=60
 fi
 
@@ -66,6 +66,7 @@ function full_cleanup ()
 	# The '-' before the pid number ($$) indicates 'kill' to signal the
 	# whole process group.
 	trap - SIGTERM && kill -- -$$
+	exit 1
 }
 
 function null_pipes ()
@@ -1685,7 +1686,7 @@ function regenerate_statedump ()
 		test "$ret" -ne "0"
 		ok $? "Expected fail on regenerate statedump $sess_name"
 	else
-		ok $ret "Metadata regenerate $sess_name"
+		ok $ret "Statedump regenerate $sess_name"
 	fi
 }