Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / tests / regression / kernel / test_kernel_function

diff --git a/tests/regression/kernel/test_kernel_function b/tests/regression/kernel/test_kernel_function
index 3a7471c868860e8fec71de44be3da1cd35ac29fb..3c941c72c78424b947e215117b360b62fff71c0f 100755 (executable)
--- a/tests/regression/kernel/test_kernel_function
+++ b/tests/regression/kernel/test_kernel_function
@@ -9,13 +9,13 @@ TEST_DESC="Kernel tracer - function event"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-NUM_TESTS=6
+NUM_TESTS=7
 
 source $TESTDIR/utils/utils.sh
 
 function test_kernel_function_basic()
 {
-       local TRACE_PATH=$(mktemp -d)
+       local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
        local SESSION_NAME="kernel_function_basic"
        local EVENT_NAME="my_event_name"
        local TARGET_SYMBOL="lttng_test_filter_event_write"
@@ -31,7 +31,7 @@ function test_kernel_function_basic()
        stop_lttng_tracing_ok
 
        validate_trace "${EVENT_NAME}_entry" $TRACE_PATH
-       validate_trace "${EVENT_NAME}_return" $TRACE_PATH
+       validate_trace "${EVENT_NAME}_exit" $TRACE_PATH
 
        destroy_lttng_session_ok $SESSION_NAME
 
@@ -43,13 +43,7 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-if [ "$(id -u)" == "0" ]; then
-       isroot=1
-else
-       isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." ||
 {
        start_lttng_sessiond_notap
        validate_lttng_modules_present