X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_ust;h=9c4f923b802fed399f135eab5d1d9e90c694a674;hp=89c4c969d4fd7b68a677dcc553745f0791038118;hb=f0d43d3d8e0c7fcb01ba1550466517d047fd6e76;hpb=e7716c6aec4c7152bd4cb060b805d8cb7051c121

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index 89c4c969d..9c4f923b8 100755
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -38,21 +38,12 @@ if [ ! -x "$TESTAPP_BIN" ]; then
 	BAIL_OUT "No UST events binary detected."
 fi
 
-function enable_channel_per_pid()
+function enable_channel_per_pid ()
 {
 	sess_name=$1
 	channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name >/dev/null 2>&1
-	ok $? "Enable channel $channel_name per PID for session $sess_name"
-}
-
-function lttng_create_session_uri
-{
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
-
-	ok $? "Create session $SESSION_NAME"
+	enable_ust_lttng_channel_ok $sess_name $channel_name --buffers-pid
 }
 
 # MUST set TESTDIR before calling those functions
@@ -91,11 +82,11 @@ function rotate_ust_test ()
 function test_ust_streaming_uid ()
 {
 	diag "Test UST streaming with session rotation per UID"
-	lttng_create_session_uri
+	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
-	rm -rf ${TRACE_PATH}/${HOSTNAME}
+	clean_path $TRACE_PATH
 }
 
 function test_ust_local_uid ()
@@ -105,18 +96,18 @@ function test_ust_local_uid ()
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	rotate_ust_test "${TRACE_PATH}" "ust/uid/*/*/" 0
-	rm -rf ${TRACE_PATH}
+	clean_path $TRACE_PATH
 }
 
 function test_ust_streaming_pid ()
 {
 	diag "Test UST streaming with session rotation per PID"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	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
-	rm -rf ${TRACE_PATH}/${HOSTNAME}
+	clean_path $TRACE_PATH
 }
 
 function test_ust_local_pid ()
@@ -127,7 +118,7 @@ function test_ust_local_pid ()
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
 	rotate_ust_test "${TRACE_PATH}" "ust/pid/*/" 1
-	rm -rf ${TRACE_PATH}
+	clean_path $TRACE_PATH
 }
 
 function test_ust_local_timer_uid ()
@@ -141,13 +132,13 @@ function test_ust_local_timer_uid ()
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}" 0
-	rm -rf ${TRACE_PATH}
+	clean_path $TRACE_PATH
 }
 
 function test_ust_streaming_timer_uid ()
 {
 	diag "Test ust remote with session rotation timer per-uid"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
 	start_lttng_tracing_ok $SESSION_NAME
@@ -155,7 +146,7 @@ function test_ust_streaming_timer_uid ()
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
-	rm -rf ${TRACE_PATH}/${HOSTNAME}
+	clean_path $TRACE_PATH
 }
 
 function test_ust_local_timer_pid ()
@@ -170,13 +161,13 @@ function test_ust_local_timer_pid ()
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}" 1
-	rm -rf ${TRACE_PATH}
+	clean_path $TRACE_PATH
 }
 
 function test_ust_streaming_timer_pid ()
 {
 	diag "Test ust remote with session rotation timer per-pid"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	enable_channel_per_pid $SESSION_NAME "channel0"
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
@@ -185,7 +176,7 @@ function test_ust_streaming_timer_pid ()
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 1
-	rm -rf ${TRACE_PATH}/${HOSTNAME}
+	clean_path $TRACE_PATH
 }
 
 function test_incompatible_sessions ()
@@ -244,4 +235,5 @@ done
 stop_lttng_sessiond
 stop_lttng_relayd
 
-exit $out
+# Remove tmp dir
+rm -rf $TRACE_PATH