X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frelayd-grouping%2Ftest_ust;h=8e2dca9cccef08696623a5bfcd1c5314d2cdefdf;hb=7e547df6a875230134157556398e767574a3da69;hp=592dbd90d0e59d35ba06c90ea0ba74c3e98a6714;hpb=3c4c35827bdf49a2e148829672e6ff1a9c1b1bb8;p=lttng-tools.git

diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust
index 592dbd90d..8e2dca9cc 100755
--- a/tests/regression/tools/relayd-grouping/test_ust
+++ b/tests/regression/tools/relayd-grouping/test_ust
@@ -19,7 +19,7 @@ CHANNEL_NAME="my_channel"
 XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
 XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
 
-NUM_TESTS=688
+NUM_TESTS=254
 
 source "$TESTDIR/utils/utils.sh"
 
@@ -34,7 +34,7 @@ function get_auto_session_name ()
 	local lttng_bin=$LTTNG_BIN
 
 	LTTNG_BIN="${lttng_bin} --mi xml"
-	OUTPUT_DEST=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output.XXXXXX")
+	OUTPUT_DEST=$(mktemp -t "tmp.${FUNCNAME[0]}_output.XXXXXX")
 
 	list_lttng_ok
 	$MI_VALIDATE "$OUTPUT_DEST"
@@ -54,18 +54,10 @@ function test_ust_uid_live ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST uid buffer live [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer live [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost --live
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -74,7 +66,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*"
@@ -93,18 +85,10 @@ function test_ust_pid_live ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST pid buffer live [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST pid buffer live [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost --live
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-pid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -113,7 +97,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*"
@@ -133,18 +117,10 @@ function test_ust_uid_live_custom_output ()
 	local session_name="$1"
 	local grouping="$2"
 	local custom_output="my_live_custom_output"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST uid buffer live, custom output [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer live, custom output [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost/$custom_output --live
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -153,7 +129,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"
@@ -172,18 +148,10 @@ function test_ust_uid_streaming ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
-
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
 
-	diag "Test UST uid buffer streaming [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer streaming [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -192,7 +160,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*"
@@ -211,18 +179,9 @@ function test_ust_pid_streaming ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
-
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST pid buffer streaming [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST pid buffer streaming [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-pid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -231,7 +190,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*"
@@ -251,18 +210,10 @@ function test_ust_uid_streaming_custom_output ()
 	local session_name="$1"
 	local grouping="$2"
 	local custom_output="custom_second_token"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST uid buffer streaming, custom output [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer streaming, custom output [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost/$custom_output
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -271,7 +222,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"
@@ -290,18 +241,10 @@ function test_ust_uid_streaming_rotate ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST uid buffer rotate [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer rotate [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -311,7 +254,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*"
@@ -331,18 +274,10 @@ function test_ust_uid_streaming_rotate_custom_output ()
 	local session_name="$1"
 	local grouping="$2"
 	local custom_output="rotate_custom_path"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST uid buffer rotate, custom output [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer rotate, custom output [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost/$custom_output
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -353,7 +288,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"
@@ -372,18 +307,10 @@ function test_ust_pid_streaming_rotate ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST pid buffer rotate with session_name [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST pid buffer rotate with session_name [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-pid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -393,7 +320,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*"
@@ -412,18 +339,10 @@ function test_ust_uid_streaming_snapshot ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST uid buffer snapshot streaming using 'create --snapshot' [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer snapshot streaming using 'create --snapshot' [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost --snapshot
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -433,7 +352,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*"
@@ -452,24 +371,16 @@ function test_ust_pid_streaming_snapshot ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
 
 	local file_sync_after_first
 	local file_sync_before_last
 
-	file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
-	file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
+	file_sync_after_first=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	file_sync_before_last=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST pid buffer snapshot streaming using 'create --snapshot' [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST pid buffer snapshot streaming using 'create --snapshot' [$grouping][${session_name}]"
 
 	create_lttng_session_uri "$session_name" net://localhost --snapshot
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-pid"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -489,7 +400,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*"
@@ -511,18 +422,10 @@ function test_ust_uid_streaming_snapshot_add_output_default_name ()
 {
 	local session_name="$1"
 	local grouping="$2"
-	local is_automatic_session=false
-
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
 
-	diag "Test UST uid buffer snapshot using 'add-output' with default snapshot name [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer snapshot using 'add-output' with default snapshot name [$grouping][${session_name}]"
 
 	create_lttng_session_no_output "$session_name"
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_lttng_mmap_overwrite_ust_channel "$session_name" "$CHANNEL_NAME"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -534,7 +437,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*"
@@ -554,18 +457,10 @@ function test_ust_uid_streaming_snapshot_add_output_custom_name ()
 	local session_name="$1"
 	local grouping="$2"
 	local snapshot_name="this_is_my_snapshot"
-	local is_automatic_session=false
 
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
-
-	diag "Test UST uid buffer snapshot using 'add-output' with custom snapshot name [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer snapshot using 'add-output' with custom snapshot name [$grouping][${session_name}]"
 
 	create_lttng_session_no_output "$session_name"
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_lttng_mmap_overwrite_ust_channel "$session_name" "$CHANNEL_NAME"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -577,7 +472,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>.
@@ -600,18 +495,10 @@ function test_ust_uid_streaming_snapshot_add_output_custom_name_custom_output ()
 	local grouping="$2"
 	local snapshot_name="this_is_my_snapshot"
 	local custom_output="this/is/my/custom/path"
-	local is_automatic_session=false
-
-	if [ -z "$session_name" ]; then
-		is_automatic_session=true
-	fi
 
-	diag "Test UST uid buffer snapshot using 'add-output' with custom snapshot name and custom output path [$grouping][${session_name:-automatic session name}]"
+	diag "Test UST uid buffer snapshot using 'add-output' with custom snapshot name and custom output path [$grouping][${session_name}]"
 
 	create_lttng_session_no_output "$session_name"
-	if [ "$is_automatic_session" = true ]; then
-		get_auto_session_name session_name
-	fi
 
 	enable_lttng_mmap_overwrite_ust_channel "$session_name" "$CHANNEL_NAME"
 	enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
@@ -623,7 +510,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*"
@@ -668,30 +555,21 @@ grouping_types=(
 	$GROUP_BY_SESSION
 	$GROUP_BY_HOSTNAME
 )
-for fct_test in "${tests[@]}";
+for grouping in "${grouping_types[@]}";
 do
-	for grouping in "${grouping_types[@]}";
+	TRACE_PATH=$(mktemp -d -t tmp.test_relayd_grouping_ust_trace_path.XXXXXX)
+	# Set the relayd in --group-output-by-session mode
+	start_lttng_relayd "-o $TRACE_PATH $grouping"
+	start_lttng_sessiond
+	for fct_test in "${tests[@]}";
 	do
-		TRACE_PATH=$(mktemp --tmpdir -d tmp.test_relayd_grouping_ust_trace_path.XXXXXX)
-		# Set the relayd in --group-output-by-session mode
-		start_lttng_relayd "-o $TRACE_PATH $grouping"
-		start_lttng_sessiond
-
-		name=""
-		# Perform test when session name is generated by the client
-		${fct_test} "$name" "$grouping"
-		count=$(find "$TRACE_PATH/" -maxdepth 1 -mindepth 1 | wc -l)
-		is "$count" "0" "LTTng-relayd output directory empty"
-
 		# Perform test when session name is given
 		name="my-session"
 		${fct_test} "$name" "$grouping"
 		count=$(find "$TRACE_PATH/" -maxdepth 1 -mindepth 1 | wc -l)
 		is "$count" "0" "LTTng-relayd output directory empty"
-
-		rm -rf "$TRACE_PATH"
-		stop_lttng_relayd
-		stop_lttng_sessiond
 	done
+	rm -rf "$TRACE_PATH"
+	stop_lttng_relayd
+	stop_lttng_sessiond
 done
-