X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_multi_app;h=c1a5158cc542bb03912f862e481c1fb5a6d5d9ac;hb=1e14294fd0ac6ea1b22a27b7b7c10abec2e2d929;hp=0a05ea6a0a8e3114fd758a8d0cb7e6e18f160e8b;hpb=345ed219918f4e6fe88b57a30ab22e1a590a6bf0;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 0a05ea6a0..c1a5158cc 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
@@ -265,7 +265,7 @@ function test_multi_app ()
 			resume_consumerd "${pipe}"
 		done
 		# Stop tracing forcing full buffer consumption
-		stop_lttng_tracing $SESSION_NAME
+		stop_lttng_tracing_ok $SESSION_NAME
 
 		# Check for notifications reception
 		wait_for_message $output_dir "${low_output_file_pattern}" "notification: low $i"
@@ -315,7 +315,7 @@ function test_multi_app_ust ()
 
 	test_multi_app ust $generator_pid
 
-	kill -9 $generator_pid 2> /dev/null
+	kill -s SIGTERM $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 }
@@ -331,7 +331,7 @@ function test_multi_app_kernel ()
 	test_multi_app kernel $generator_pid
 
 
-	kill -9 $generator_pid 2>/dev/null
+	kill -s SIGTERM $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 
@@ -348,7 +348,7 @@ function test_on_register_evaluation_ust ()
 
 	test_on_register_evaluation ust $generator_pid
 
-	kill -9 $generator_pid 2> /dev/null
+	kill -s SIGTERM $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 
@@ -366,7 +366,7 @@ function test_on_register_evaluation_kernel()
 	test_on_register_evaluation kernel $generator_pid
 
 
-	kill -9 $generator_pid 2> /dev/null
+	kill -s SIGTERM $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 	rm -rf ${TESTAPP_STATE_FILE} 2> /dev/null
 
@@ -458,7 +458,7 @@ function test_on_register_evaluation ()
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond
 
-	kill -9 $generator_pid
+	kill -s SIGTERM $generator_pid 2> /dev/null
 	wait $generator_pid 2> /dev/null
 
 	for pipe in "${consumerd_pipe[@]}"; do
@@ -474,6 +474,7 @@ TESTS=(
 )
 
 if [ "$(id -u)" == "0" ]; then
+	validate_lttng_modules_present
 	TESTS+=(
 	test_multi_app_kernel
 	test_on_register_evaluation_kernel