Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / tests / perf / test_perf_raw.in

diff --git a/tests/perf/test_perf_raw.in b/tests/perf/test_perf_raw.in
index 8138c25b49c5d8cec148e44a62ab3e001080f18f..00cdebc5567d1cccdc0ee9ddd13022040f382fc2 100644 (file)
--- a/tests/perf/test_perf_raw.in
+++ b/tests/perf/test_perf_raw.in
@@ -40,13 +40,13 @@ function have_libpfm()
 
 function test_ust_raw()
 {
-       local TRACE_PATH=$(mktemp -d)
        local SESSION_NAME="ust_perf"
        local CHAN_NAME="mychan"
        local EVENT_NAME="tp:tptest"
        local PMU="UNHALTED_REFERENCE_CYCLES"
        local tests_to_skip=9
        local ret
+       local TRACE_PATH
 
        # Find the raw perf id of the event.
        PERFID=$("$CURDIR/find_event" "$PMU")
@@ -64,6 +64,8 @@ function test_ust_raw()
                return
        fi
 
+       TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
        enable_ust_lttng_channel_ok $SESSION_NAME $CHAN_NAME
@@ -87,7 +89,6 @@ function test_ust_raw()
 
 function test_kernel_raw()
 {
-       local TRACE_PATH=$(mktemp -d)
        local SESSION_NAME="kernel_perf"
        local CHAN_NAME="mychan"
        local EVENT_NAME="lttng_test_filter_event"
@@ -95,6 +96,7 @@ function test_kernel_raw()
        local PERFID=""
        local tests_to_skip=9
        local ret
+       local TRACE_PATH
 
        # Find the raw perf id of the event.
        PERFID=$("$CURDIR/find_event" "$PMU")
@@ -112,6 +114,8 @@ function test_kernel_raw()
                return
        fi
 
+       TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
        lttng_enable_kernel_channel_ok $SESSION_NAME $CHAN_NAME
@@ -133,12 +137,6 @@ function test_kernel_raw()
        rm -rf $TRACE_PATH
 }
 
-if [ "$(id -u)" == "0" ]; then
-       isroot=1
-else
-       isroot=0
-fi
-
 # MUST set TESTDIR before calling those functions
 plan_tests $NUM_TESTS
 
@@ -150,7 +148,7 @@ have_libpfm
 
 test_ust_raw
 
-skip $isroot "Root access is needed for kernel testing, skipping." 9 ||
+check_skip_kernel_test 9 ||
 {
        modprobe lttng-test
        test_kernel_raw