X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Fust%2Ftest_event_perf;h=01c137a19b23a3b3d72f32b11416d152e764822a;hb=HEAD;hp=19c7ac7a484f4c07b3120b42adcc8d3c4322ada9;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/ust/test_event_perf b/tests/regression/ust/test_event_perf
index 19c7ac7a4..127cdb0b7 100755
--- a/tests/regression/ust/test_event_perf
+++ b/tests/regression/ust/test_event_perf
@@ -56,7 +56,7 @@ function add_context_ust_skip_ok()
 # Only test parsing of the enabling by raw ID
 function test_parsing_raw()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="ust_event_basic"
 	CHAN_NAME="mychan"
 
@@ -84,7 +84,7 @@ function test_parsing_raw()
 
 function test_event_basic()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="ust_event_basic"
 	CHAN_NAME="mychan"
 
@@ -119,17 +119,13 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-if [ "$(id -u)" == "0" ]; then
-        isroot=1
-else
-        isroot=0
-fi
+bail_out_if_no_babeltrace
 
 start_lttng_sessiond
 
 test_parsing_raw
 
-skip $isroot "Root access is needed. Skipping UST perf tests." 8 ||
+check_skip_kernel_test 8 "Skipping UST perf tests." ||
 {
 	test_event_basic
 }