X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ftest_event_perf;h=a01418ab55167cd60c64c4b921961411120ef525;hb=4fe444dafd2243de56091ab5dd7efa0050b0597f;hp=84e56d31df7b48896bff109bbfc0b7bc4b8bd007;hpb=e563bbdb8fa6592790e9ac4e9db7d9decf022023;p=lttng-tools.git

diff --git a/tests/regression/ust/test_event_perf b/tests/regression/ust/test_event_perf
index 84e56d31d..a01418ab5 100755
--- a/tests/regression/ust/test_event_perf
+++ b/tests/regression/ust/test_event_perf
@@ -70,28 +70,30 @@ function test_event_basic()
 
 	$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
 }
 
-uname -m|grep x86 >/dev/null
-if test $? != 0; then
-	plan_tests 1
-	ok 0 "This test only runs on x86"
-	exit 0
-fi
-
 # MUST set TESTDIR before calling those functions
 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
+}