X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_ust;h=08a140d9e3ac76d80a3e52c324ad2a410a0a1295;hb=8f2d0517807e5e0ed723f1c2f3679b45ae25df2d;hp=924b04e5c6446ae810a5fd82b17d841f49f1fa4f;hpb=d09115eeffb1c3e1a4d01e8be9ed1af4dfe966c8;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index 924b04e5c..08a140d9e 100755
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -18,18 +18,16 @@ TEST_DESC="Rotation - User space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-NR_ITER=1
 NR_USEC_WAIT=0
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=146
+NUM_TESTS=150
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -46,14 +44,6 @@ function enable_channel_per_pid ()
 	enable_ust_lttng_channel_ok $sess_name $channel_name --buffers-pid
 }
 
-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"
-}
-
 # MUST set TESTDIR before calling those functions
 
 function rotate_ust_test ()
@@ -90,11 +80,10 @@ 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
-	clean_path $TRACE_PATH
 }
 
 function test_ust_local_uid ()
@@ -104,18 +93,16 @@ function test_ust_local_uid ()
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	rotate_ust_test "${TRACE_PATH}" "ust/uid/*/*/" 0
-	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
-	clean_path $TRACE_PATH
 }
 
 function test_ust_local_pid ()
@@ -126,7 +113,6 @@ function test_ust_local_pid ()
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
 	rotate_ust_test "${TRACE_PATH}" "ust/pid/*/" 1
-	clean_path $TRACE_PATH
 }
 
 function test_ust_local_timer_uid ()
@@ -140,13 +126,12 @@ function test_ust_local_timer_uid ()
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}" 0
-	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
@@ -154,7 +139,6 @@ function test_ust_streaming_timer_uid ()
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
-	clean_path $TRACE_PATH
 }
 
 function test_ust_local_timer_pid ()
@@ -169,13 +153,12 @@ function test_ust_local_timer_pid ()
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}" 1
-	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
@@ -184,7 +167,6 @@ function test_ust_streaming_timer_pid ()
 	$TESTAPP_BIN 0 0 /dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 1
-	clean_path $TRACE_PATH
 }
 
 function test_incompatible_sessions ()
@@ -193,19 +175,19 @@ function test_incompatible_sessions ()
 
 	diag "Live session with rotate timer"
 	# Should not be able to enable a rotation timer with a live session
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live >/dev/null 2>&1
+	create_lttng_session_uri $SESSION_NAME net://localhost --live
 	lttng_enable_rotation_timer_fail $SESSION_NAME 500ms
 	destroy_lttng_session_ok $SESSION_NAME
 
 	diag "Snapshot session with rotate timer"
 	# Should not be able to enable a rotation timer with a snapshot session
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --snapshot >/dev/null 2>&1
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH --snapshot
 	lttng_enable_rotation_timer_fail $SESSION_NAME 500ms
 	destroy_lttng_session_ok $SESSION_NAME
 
 	diag "Live session with rotate"
 	# Should not be able to rotate a live session
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live >/dev/null 2>&1
+	create_lttng_session_uri $SESSION_NAME net://localhost --live
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	rotate_session_fail $SESSION_NAME
@@ -213,12 +195,11 @@ function test_incompatible_sessions ()
 
 	diag "Snapshot session with rotate"
 	# Should not be able to rotate a snapshot session
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --snapshot >/dev/null 2>&1
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH --snapshot
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	rotate_session_fail $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
-
 }
 
 plan_tests $NUM_TESTS
@@ -238,6 +219,7 @@ for fct_test in ${tests[@]};
 do
 	SESSION_NAME=$(randstring 16 0)
 	${fct_test}
+	clean_path $TRACE_PATH
 done
 
 stop_lttng_sessiond