X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_ust_streaming;h=eecd0253bd6fe56cfa16ef3c65eaa193f05331de;hp=20d4f7f6b136e3beb6f8d0316829fed9213b67b9;hb=b178f53e90c376dd44b020535c32649edef8f80e;hpb=3b33e9e731f2091e8aa13ea035c295ed6f101eac

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index 20d4f7f6b..eecd0253b 100755
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -99,8 +99,7 @@ function test_ust_default_name_with_del()
 	lttng_snapshot_record $SESSION_NAME
 
 	# Validate test
-	echo $TRACE_PATH/$HOSTNAME/snapshot-1
-	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
 	if [ $? -ne 0 ]; then
 		stop_test_apps
 		return $?
@@ -111,7 +110,7 @@ function test_ust_default_name_with_del()
 	lttng_snapshot_record $SESSION_NAME
 
 	# Validate test with the next ID since a del output was done prior.
-	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-2*
+	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-2*
 	if [ $? -ne 0 ]; then
 		stop_test_apps
 		return $?
@@ -141,7 +140,7 @@ function test_ust_default_name()
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 	# Validate test
-	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
 	out=$?
 
 	stop_test_apps
@@ -164,7 +163,7 @@ function test_ust_default_name_custom_uri()
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 	# Validate test
-	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
 	out=$?
 
 	stop_test_apps
@@ -191,10 +190,10 @@ function test_ust_custom_name()
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 
-	if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then
+	if ls $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/$name* &> /dev/null; then
 		ok 0 "Custom name snapshot exists"
 		# Validate test
-		validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$name-*
+		validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/$name-*
 		out=$?
 	else
 		fail "No custom name snapshot found"
@@ -219,7 +218,7 @@ function test_ust_n_snapshot()
 		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*
+		validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
 		if [ $? -ne 0 ]; then
 			return 1
 		fi