X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frelayd-grouping%2Ftest_ust;h=fe40bd5510a24d8e8fb875263647429b42121e21;hb=f52a7d1581ec1e62d8563fdcd455fec39eeadb93;hp=09929e25d6718b4cd6562112b92adc80e103bc22;hpb=997be615376899b862cb993626f7a566323bce8e;p=lttng-tools.git

diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust
index 09929e25d..fe40bd551 100755
--- a/tests/regression/tools/relayd-grouping/test_ust
+++ b/tests/regression/tools/relayd-grouping/test_ust
@@ -74,7 +74,7 @@ function test_ust_uid_live ()
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
@@ -113,7 +113,7 @@ function test_ust_pid_live ()
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
@@ -153,7 +153,7 @@ function test_ust_uid_live_custom_output ()
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/$custom_output"
@@ -192,7 +192,7 @@ function test_ust_uid_streaming ()
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
@@ -231,7 +231,7 @@ function test_ust_pid_streaming ()
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
@@ -271,7 +271,7 @@ function test_ust_uid_streaming_custom_output ()
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/$custom_output"
@@ -311,7 +311,7 @@ function test_ust_uid_streaming_rotate ()
 	rotate_session_ok "$session_name"
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
@@ -353,7 +353,7 @@ function test_ust_uid_streaming_rotate_custom_output ()
 
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/$custom_output"
@@ -393,7 +393,7 @@ function test_ust_pid_streaming_rotate ()
 	rotate_session_ok "$session_name"
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
@@ -433,7 +433,7 @@ function test_ust_uid_streaming_snapshot ()
 	lttng_snapshot_record "$session_name"
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
@@ -489,7 +489,7 @@ function test_ust_pid_streaming_snapshot ()
 	wait
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/snapshot-1*"
@@ -534,7 +534,7 @@ function test_ust_uid_streaming_snapshot_add_output_default_name ()
 	lttng_snapshot_record "$session_name"
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/snapshot-1*"
@@ -577,7 +577,7 @@ function test_ust_uid_streaming_snapshot_add_output_custom_name ()
 	lttng_snapshot_record "$session_name"
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	# When session name is automatic, the actual directory is "auto", not
 	# auto-<datetime>.
@@ -623,7 +623,7 @@ function test_ust_uid_streaming_snapshot_add_output_custom_name_custom_output ()
 	lttng_snapshot_record "$session_name"
 
 	stop_lttng_tracing_ok "$session_name"
-	destroy_lttng_session_ok "$session_name"
+	destroy_lttng_session_ok "$session_name" --no-wait
 
 	if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
 		validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/$custom_output/$snapshot_name*"