X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_multi_app;h=a9866ed43d16b8eee23e4ba7af87f8daeab4167f;hp=0a05ea6a0a8e3114fd758a8d0cb7e6e18f160e8b;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=345ed219918f4e6fe88b57a30ab22e1a590a6bf0

diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
index 0a05ea6a0..a9866ed43 100755
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -97,7 +97,7 @@ function ust_event_generator
 			if [[ -f $state_file ]]; then
 				rm $state_file 2> /dev/null
 			fi
-			taskset  -c 0 $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT > /dev/null 2>&1
+			taskset  -c 0 $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT > /dev/null 2>&1
 		fi
 	done
 }
@@ -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