X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frelayd-grouping%2Ftest_ust;h=fe40bd5510a24d8e8fb875263647429b42121e21;hb=f52a7d1581ec1e62d8563fdcd455fec39eeadb93;hp=1b1299b902e7b61c0bccc6651645714ab3ae0aff;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust
index 1b1299b90..fe40bd551 100755
--- a/tests/regression/tools/relayd-grouping/test_ust
+++ b/tests/regression/tools/relayd-grouping/test_ust
@@ -16,15 +16,9 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 EVENT_NAME="tp:tptest"
 CHANNEL_NAME="my_channel"
 
-XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
-
-XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH"
-XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml"
-
 XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
 XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
 
-
 NUM_TESTS=688
 
 source "$TESTDIR/utils/utils.sh"
@@ -40,14 +34,15 @@ function get_auto_session_name ()
 	local lttng_bin=$LTTNG_BIN
 
 	LTTNG_BIN="${lttng_bin} --mi xml"
-	OUTPUT_DEST=$(mktemp)
+	OUTPUT_DEST=$(mktemp -t "tmp.${FUNCNAME[0]}_output.XXXXXX")
 
-	list_lttng_with_opts
-	$XML_VALIDATE "$OUTPUT_DEST"
+	list_lttng_ok
+	$MI_VALIDATE "$OUTPUT_DEST"
 	ok $? "Valid lttng list XML"
 
 	value=$($XML_EXTRACT "$OUTPUT_DEST" ${XPATH_SESSION}/lttng:name/text\(\))
 	ok $? "Extraction of session name"
+	rm -f $OUTPUT_DEST
 	OUTPUT_DEST=/dev/null
 	LTTNG_BIN=$lttng_bin
 
@@ -79,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*"
@@ -118,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*"
@@ -158,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"
@@ -197,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*"
@@ -236,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*"
@@ -276,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"
@@ -316,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*"
@@ -358,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"
@@ -398,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*"
@@ -438,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*"
@@ -462,8 +457,8 @@ function test_ust_pid_streaming_snapshot ()
 	local file_sync_after_first
 	local file_sync_before_last
 
-	file_sync_after_first=$(mktemp -u)
-	file_sync_before_last=$(mktemp -u)
+	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
@@ -494,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*"
@@ -539,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*"
@@ -582,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>.
@@ -628,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*"
@@ -647,6 +642,7 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
 
 tests=(
 	test_ust_uid_live
@@ -676,7 +672,7 @@ for fct_test in "${tests[@]}";
 do
 	for grouping in "${grouping_types[@]}";
 	do
-		TRACE_PATH=$(mktemp -d)
+		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