X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fcrash%2Ftest_crash;h=be61cda2fb2dfa4c0399829276144a020e862299;hp=35a5bd7bcb72fd858cd3338de2fe1d308157de1c;hb=3e46b4ca56f63bddb99098556060898e07df8c06;hpb=93c4b58325c074281b332afb451356685641f33a

diff --git a/tests/regression/tools/crash/test_crash b/tests/regression/tools/crash/test_crash
index 35a5bd7bc..be61cda2f 100755
--- a/tests/regression/tools/crash/test_crash
+++ b/tests/regression/tools/crash/test_crash
@@ -87,19 +87,11 @@ function stop_test_app()
 function verify_path_dont_exists()
 {
 	local path=$1
-	local timeout_try_limit=100
-	local timeout_try_count=0
-	local timeout_flag=0
 
 	while find $path -mindepth 1 -maxdepth 1 &>/dev/null ; do
-		if [[ $timeout_try_count -gt $timeout_try_limit ]]; then
-			timeout_flag=1
-			break
-		fi
-		timeout_try_count=$((timeout_try_count+1))
-		sleep 0.1
+		sleep 2
 	done
-	return $timeout_flag
+	return 0
 }
 
 function test_shm_path_per_pid()
@@ -385,6 +377,14 @@ function test_lttng_crash_extraction_sigkill()
 	rm -rf $extraction_dir_path
 }
 
+function interrupt_cleanup()
+{
+    diag "*** Cleaning-up test ***"
+    stop_test_apps
+    stop_lttng_sessiond
+    exit 1
+}
+
 TESTS=(
 	test_shm_path_per_uid
 	test_shm_path_per_pid
@@ -395,6 +395,7 @@ TESTS=(
 	test_lttng_crash_extraction_sigkill
 )
 
+trap interrupt_cleanup SIGTERM SIGINT
 
 for fct_test in ${TESTS[@]};
 do