X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ftest_event_perf;h=7dc21681fd26deb291e10724f8a68fd6d368bf25;hb=f37e092d5360510f2975ea5bd0ae69084ae17691;hp=4e08ef08d109ea61ac27eb88549ed622ce624d5f;hpb=c1e454f7dcdcfd3a1c1e756c5e993310d7bb8c61;p=lttng-tools.git

diff --git a/tests/regression/ust/test_event_perf b/tests/regression/ust/test_event_perf
index 4e08ef08d..7dc21681f 100755
--- a/tests/regression/ust/test_event_perf
+++ b/tests/regression/ust/test_event_perf
@@ -58,21 +58,21 @@ function test_event_basic()
 	SESSION_NAME="ust_event_basic"
 	CHAN_NAME="mychan"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
-	enable_ust_lttng_channel $SESSION_NAME $CHAN_NAME
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHAN_NAME
 
 	enable_ust_lttng_event_per_chan $SESSION_NAME $EVENT_NAME $CHAN_NAME
 
 	add_ust_lttng_context $SESSION_NAME $CHAN_NAME "perf:thread:page-fault"
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
 
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	validate_trace "perf_thread_page_fault" $TRACE_PATH
 	rm -rf $TRACE_PATH
@@ -90,8 +90,17 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-start_lttng_sessiond
+if [ "$(id -u)" == "0" ]; then
+        isroot=1
+else
+        isroot=0
+fi
+
+skip $isroot "Root access is needed. Skipping UST perf tests." ${NUM_TESTS} ||
+{
+	start_lttng_sessiond
 
-test_event_basic
+	test_event_basic
 
-stop_lttng_sessiond
+	stop_lttng_sessiond
+}