X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ftest_event_basic;h=df86d2914d88991886e1b85f63a5b588b529925c;hb=96340a015194538227efcbc654ec02c2ed9961ce;hp=5a9cfe41bacc3efc049610d2d860dfb0167b4982;hpb=8679c86b06b7380a566e9380018a95491f4e9cb2;p=lttng-tools.git

diff --git a/tests/regression/ust/test_event_basic b/tests/regression/ust/test_event_basic
index 5a9cfe41b..df86d2914 100755
--- a/tests/regression/ust/test_event_basic
+++ b/tests/regression/ust/test_event_basic
@@ -27,8 +27,6 @@ NUM_TESTS=25
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 function enable_ust_lttng_event_per_chan()
 {
 	sess_name="$1"
@@ -70,11 +68,11 @@ function test_event_basic()
 	EVENT_NAME2="ev2"
 	EVENT_NAME3="ev3"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
-	create_lttng_session $SESSION_NAME2 $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME2 $TRACE_PATH
 
-	enable_ust_lttng_channel $SESSION_NAME $CHAN_NAME
-	enable_ust_lttng_channel $SESSION_NAME2 $CHAN_NAME2
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHAN_NAME
+	enable_ust_lttng_channel_ok $SESSION_NAME2 $CHAN_NAME2
 
 	enable_ust_lttng_event_per_chan $SESSION_NAME $EVENT_NAME $CHAN_NAME
 	enable_ust_lttng_event_per_chan $SESSION_NAME $EVENT_NAME2 $CHAN_NAME
@@ -92,11 +90,11 @@ function test_event_basic()
 	enable_ust_lttng_event_per_chan $SESSION_NAME $EVENT_NAME $CHAN_NAME
 	enable_ust_lttng_event_per_chan $SESSION_NAME2 $EVENT_NAME3 $CHAN_NAME2
 
-	start_lttng_tracing
-	stop_lttng_tracing
+	start_lttng_tracing_ok
+	stop_lttng_tracing_ok
 
-	start_lttng_tracing
-	stop_lttng_tracing
+	start_lttng_tracing_ok
+	stop_lttng_tracing_ok
 
 	TODO="Validate trace output is coherent"
 	ok 0 "Validate trace"
@@ -111,6 +109,8 @@ function test_event_basic()
 # MUST set TESTDIR before calling those functions
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 start_lttng_sessiond
 
 test_event_basic