Use compiler-agnostic defines to silence warning

[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 9b2de4de28817651272c047d59087fa31ff61b09..7e62f6ea8b8ec74202fbab79759932b7dad57736 100755 (executable)
--- a/tests/regression/ust/test_event_perf
+++ b/tests/regression/ust/test_event_perf
@@ -39,9 +39,9 @@ function add_context_ust_skip_ok()
 
        local ret
 
-       "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" add-context -u \
-               -s "$session_name" -c "$channel_name" \
-               -t "$context_name"  1>"$OUTPUT_DEST" 2>"$ERROR_OUTPUT_DEST"
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" \
+               add-context -u -s "$session_name" -c "$channel_name" \
+               -t "$context_name"
        ret=$?
 
        if [ "$ret" == "4" ]; then
@@ -121,17 +121,11 @@ print_test_banner "$TEST_DESC"
 
 bail_out_if_no_babeltrace
 
-if [ "$(id -u)" == "0" ]; then
-        isroot=1
-else
-        isroot=0
-fi
-
 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
 }