Import CStringView from the Babeltrace tree

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

diff --git a/tests/regression/kernel/test_event_basic b/tests/regression/kernel/test_event_basic
index b0ed0ea9021ae916fc219cadbda698d0bd2cdd23..e57cd6d26a1561805da32bc28ba1cb8192bd0433 100755 (executable)
--- a/tests/regression/kernel/test_event_basic
+++ b/tests/regression/kernel/test_event_basic
@@ -9,7 +9,7 @@ TEST_DESC="Kernel tracer - Basic event"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-NUM_TESTS=20
+NUM_TESTS=21
 
 TESTCMD="/bin/true"
 
@@ -17,7 +17,7 @@ source $TESTDIR/utils/utils.sh
 
 function test_event_basic()
 {
-       TRACE_PATH=$(mktemp -d)
+       TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
        SESSION_NAME="kernel_event_basic"
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -33,6 +33,7 @@ function test_event_basic()
        eval ${TESTCMD}
        stop_lttng_tracing_ok
 
+       validate_trace_path_kernel "$TRACE_PATH" ""
        validate_trace "sched_switch" $TRACE_PATH
        validate_trace "sched_process_exit" $TRACE_PATH
        validate_trace "sched_process_fork" $TRACE_PATH
@@ -44,7 +45,7 @@ function test_event_basic()
 
 function test_enable_after_start()
 {
-       TRACE_PATH=$(mktemp -d)
+       TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
        SESSION_NAME="kernel_enable_after_start"
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -72,14 +73,9 @@ 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." ||
 {
+       validate_lttng_modules_present
        start_lttng_sessiond
 
        test_event_basic