X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_ust;h=bb788840c3bca0859b1b5b4c591c8bd335273cd6;hb=c7f643372d3d23515781191cce9731aeffdf2ea0;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..bb788840c 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
@@ -185,19 +183,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,7 +203,7 @@ 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