X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_multi_app;h=0c578d223f75ad564629dc2e8bb1731da20eff0a;hb=874499e2b07b8b4cbafe656f1176a66edd48b716;hp=7465a83f813fa7bdc8d34cb6bfaab745d44d897a;hpb=7fe98a985f6fddf7eba195c138fad23339676979;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
index 7465a83f8..0c578d223 100755
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -54,7 +54,7 @@ print_test_banner "$TEST_DESC"
 
 app_pids=()
 
-function kernel_event_generator_toogle_state
+function kernel_event_generator_toggle_state
 {
 	kernel_event_generator_suspended=$((kernel_event_generator_suspended==0))
 
@@ -63,8 +63,8 @@ function kernel_event_generator
 {
 	state_file=$1
 	kernel_event_generator_suspended=0
-	trap kernel_event_generator_toogle_state SIGUSR1
-	trap "exit" SIGTERM SIGINT
+	trap kernel_event_generator_toggle_state SIGUSR1
+
 	while (true); do
 		if [[ $kernel_event_generator_suspended -eq "1" ]]; then
 			touch $state_file
@@ -78,7 +78,7 @@ function kernel_event_generator
 	done
 }
 
-function ust_event_generator_toogle_state
+function ust_event_generator_toggle_state
 {
 	ust_event_generator_suspended=$((ust_event_generator_suspended==0))
 
@@ -87,7 +87,7 @@ function ust_event_generator
 {
 	state_file=$1
 	ust_event_generator_suspended=0
-	trap ust_event_generator_toogle_state SIGUSR1
+	trap ust_event_generator_toggle_state SIGUSR1
 	trap "exit" SIGTERM SIGINT
 	while (true); do
 		if [[ $ust_event_generator_suspended -eq "1" ]]; then
@@ -297,7 +297,6 @@ function test_multi_app ()
 		print_errors $output_dir "${high_output_file_pattern}"
 	fi
 
-	rm -rf $output_dir
 
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond
@@ -305,6 +304,8 @@ function test_multi_app ()
 	for pipe in "${consumerd_pipe[@]}"; do
 		rm -rf "${pipe}"
 	done
+
+	rm -rf $output_dir
 }
 
 function test_multi_app_ust ()
@@ -453,7 +454,6 @@ function test_on_register_evaluation ()
 		print_errors "${high_output_file_pattern}"
 	fi
 
-	rm -rf $output_dir
 
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond
@@ -465,6 +465,7 @@ function test_on_register_evaluation ()
 		rm -rf "${pipe}"
 	done
 
+	rm -rf "$output_dir"
 }
 
 
@@ -474,6 +475,7 @@ TESTS=(
 )
 
 if [ "$(id -u)" == "0" ]; then
+	validate_lttng_modules_present
 	TESTS+=(
 	test_multi_app_kernel
 	test_on_register_evaluation_kernel