X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_ust_streaming;h=20d4f7f6b136e3beb6f8d0316829fed9213b67b9;hb=b67cdb8c808af540b7c0062e756170238057c6f3;hp=4dcac4a16a6c8c25aa77218a3afcf30f7c296e0a;hpb=e563bbdb8fa6592790e9ac4e9db7d9decf022023;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index 4dcac4a16..20d4f7f6b 100755
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -19,20 +19,19 @@ TEST_DESC="Streaming - Snapshot UST tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 SESSION_NAME=""
 CHANNEL_NAME="chan1"
 BIN_NAME="gen-nevents"
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-NR_ITER=2000000
+NR_ITER=-1
 NR_USEC_WAIT=100
 APPS_PID=
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=49
+NUM_TESTS=75
 
 source $TESTDIR/utils/utils.sh
 
@@ -107,7 +106,7 @@ function test_ust_default_name_with_del()
 		return $?
 	fi
 
-	lttng_snapshot_del_output $SESSION_NAME 1
+	lttng_snapshot_del_output_ok $SESSION_NAME 1
 	snapshot_add_output $SESSION_NAME "net://localhost"
 	lttng_snapshot_record $SESSION_NAME
 
@@ -118,8 +117,8 @@ function test_ust_default_name_with_del()
 		return $?
 	fi
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	stop_test_apps
 
@@ -139,8 +138,8 @@ function test_ust_default_name()
 
 	snapshot_add_output $SESSION_NAME "net://localhost"
 	lttng_snapshot_record $SESSION_NAME
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 	# Validate test
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
 	out=$?
@@ -162,8 +161,8 @@ function test_ust_default_name_custom_uri()
 
 	snapshot_add_output $SESSION_NAME "-C tcp://localhost:5342 -D tcp://localhost:5343"
 	lttng_snapshot_record $SESSION_NAME
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 	# Validate test
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
 	out=$?
@@ -189,8 +188,8 @@ function test_ust_custom_name()
 
 	snapshot_add_output $SESSION_NAME "net://localhost" $name
 	lttng_snapshot_record $SESSION_NAME
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then
 		ok 0 "Custom name snapshot exists"
@@ -207,6 +206,33 @@ function test_ust_custom_name()
 	return $out
 }
 
+function test_ust_n_snapshot()
+{
+	diag "Test ust snapshot streaming multiple consecutive snapshot"
+	create_lttng_session_no_output $SESSION_NAME
+	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	snapshot_add_output $SESSION_NAME "net://localhost" $name
+	start_test_app
+	for i in {1..5};
+	do
+		start_lttng_tracing_ok $SESSION_NAME
+		lttng_snapshot_record $SESSION_NAME
+		stop_lttng_tracing_ok $SESSION_NAME
+		validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+		if [ $? -ne 0 ]; then
+			return 1
+		fi
+		set -u
+		rm -rf $TRACE_PATH/$HOSTNAME
+		set +u
+	done
+
+	destroy_lttng_session_ok $SESSION_NAME
+	stop_test_apps
+	return 0
+}
+
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
@@ -220,7 +246,12 @@ fi
 start_lttng_relayd "-o $TRACE_PATH"
 start_lttng_sessiond
 
-tests=( test_ust_default_name_with_del test_ust_default_name test_ust_custom_name test_ust_default_name_custom_uri )
+tests=( test_ust_default_name_with_del
+	test_ust_default_name
+	test_ust_custom_name
+	test_ust_default_name_custom_uri
+	test_ust_n_snapshot
+)
 
 for fct_test in ${tests[@]};
 do