X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_ust;h=a4988dada45cd9efa37aca1f23cc66715b706032;hb=3b33e9e731f2091e8aa13ea035c295ed6f101eac;hp=69bc18e1c5864a29729c3fe5a8d4b973e832571a;hpb=1320cab14db79aad4429e9f207ba8fa27b52f498;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index 69bc18e1c..a4988dada 100755
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -75,7 +75,7 @@ function test_ust_streaming_uid ()
 	create_lttng_session_uri $SESSION_NAME net://localhost
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
-	rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/uid/*/*/" 0
+	rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" "ust/uid/*/*/" 0
 }
 
 function test_ust_local_uid ()
@@ -84,7 +84,7 @@ function test_ust_local_uid ()
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
-	rotate_ust_test "${TRACE_PATH}" "ust/uid/*/*/" 0
+	rotate_ust_test "${TRACE_PATH}/archives" "ust/uid/*/*/" 0
 }
 
 function test_ust_streaming_pid ()
@@ -94,7 +94,7 @@ function test_ust_streaming_pid ()
 	enable_channel_per_pid $SESSION_NAME "channel0"
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
-	rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/pid/*/" 1
+	rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" "ust/pid/*/" 1
 }
 
 function test_ust_local_pid ()
@@ -104,7 +104,7 @@ function test_ust_local_pid ()
 	enable_channel_per_pid $SESSION_NAME "channel0"
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
-	rotate_ust_test "${TRACE_PATH}" "ust/pid/*/" 1
+	rotate_ust_test "${TRACE_PATH}/archives" "ust/pid/*/" 1
 }
 
 function test_ust_local_timer_uid ()
@@ -117,7 +117,7 @@ function test_ust_local_timer_uid ()
 	# We just want the app to register, no event generated
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
-	rotate_timer_test "${TRACE_PATH}" 0
+	rotate_timer_test "${TRACE_PATH}/archives" 0
 }
 
 function test_ust_streaming_timer_uid ()
@@ -130,7 +130,7 @@ function test_ust_streaming_timer_uid ()
 	# We just want the app to register, no event generated
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
-	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
+	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 0
 }
 
 function test_ust_local_timer_pid ()
@@ -144,7 +144,7 @@ function test_ust_local_timer_pid ()
 	# We just want the app to register, no event generated
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
-	rotate_timer_test "${TRACE_PATH}" 1
+	rotate_timer_test "${TRACE_PATH}/archives" 1
 }
 
 function test_ust_streaming_timer_pid ()
@@ -158,7 +158,7 @@ function test_ust_streaming_timer_pid ()
 	# We just want the app to register, no event generated
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
-	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 1
+	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 1
 }
 
 function test_incompatible_sessions ()
@@ -207,6 +207,8 @@ tests=( test_ust_streaming_uid test_ust_local_uid \
 	test_ust_local_timer_pid test_ust_streaming_timer_pid \
 	test_incompatible_sessions )
 
+#tests=( test_ust_local_timer_uid )
+
 for fct_test in ${tests[@]};
 do
 	SESSION_NAME=$(randstring 16 0)