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

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index 9c4f923b8..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
@@ -86,7 +84,6 @@ function test_ust_streaming_uid ()
 	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 ()
@@ -96,7 +93,6 @@ 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 ()
@@ -107,7 +103,6 @@ function test_ust_streaming_pid ()
 	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 ()
@@ -118,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 ()
@@ -132,7 +126,6 @@ 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 ()
@@ -146,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 ()
@@ -161,7 +153,6 @@ 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 ()
@@ -176,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 ()
@@ -185,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
@@ -205,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
@@ -230,6 +219,7 @@ for fct_test in ${tests[@]};
 do
 	SESSION_NAME=$(randstring 16 0)
 	${fct_test}
+	clean_path $TRACE_PATH
 done
 
 stop_lttng_sessiond