Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / tests / regression / ust / test_event_perf

diff --git a/tests/regression/ust/test_event_perf b/tests/regression/ust/test_event_perf
index 33aab2981272beb8e9695f77c568660aa29aa1e9..127cdb0b7f25304257567a7c26995ba127fbf54c 100755 (executable)
--- 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 --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+       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 --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+       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
 }