X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_multi_app;h=9468d0a0db19c8aeb66486cc2a3352a850eb3c8a;hp=118b781cf0380a164aacefa991a6913edaa04871;hb=d0e263e7e628d2eba76c883ffc6fb92065e440c7;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33

diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
index 118b781cf..9468d0a0d 100755
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -43,7 +43,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))
 
@@ -52,7 +52,7 @@ function kernel_event_generator
 {
 	state_file=$1
 	kernel_event_generator_suspended=0
-	trap kernel_event_generator_toogle_state SIGUSR1
+	trap kernel_event_generator_toggle_state SIGUSR1
 
 	while (true); do
 		if [[ $kernel_event_generator_suspended -eq "1" ]]; then
@@ -67,7 +67,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))
 
@@ -76,7 +76,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
@@ -286,7 +286,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
@@ -294,6 +293,8 @@ function test_multi_app ()
 	for pipe in "${consumerd_pipe[@]}"; do
 		rm -rf "${pipe}"
 	done
+
+	rm -rf $output_dir
 }
 
 function test_multi_app_ust ()
@@ -324,7 +325,7 @@ function test_multi_app_kernel ()
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 }
 
 function test_on_register_evaluation_ust ()
@@ -359,7 +360,7 @@ function test_on_register_evaluation_kernel()
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 }
 
 function test_on_register_evaluation ()
@@ -442,7 +443,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
@@ -454,6 +454,7 @@ function test_on_register_evaluation ()
 		rm -rf "${pipe}"
 	done
 
+	rm -rf "$output_dir"
 }