X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_channel;h=6c7d2db0791bdbb810bb1ccd9b71bf5a1e11341b;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=158375d3c3038fcbd47c35738c822d253c87efb4;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_channel b/tests/regression/kernel/test_channel
index 158375d3c..6c7d2db07 100755
--- a/tests/regression/kernel/test_channel
+++ b/tests/regression/kernel/test_channel
@@ -15,7 +15,7 @@ source $TESTDIR/utils/utils.sh
 
 function test_channel_buffer()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="test_session_name"
 	CHANNEL_NAME="test_channel_name"
 	create_lttng_session_ok "$SESSION_NAME" "$TRACE_PATH"
@@ -30,7 +30,7 @@ function test_channel_buffer()
 
 function test_channel_buffer_too_large()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="test_session_name"
 	CHANNEL_NAME="test_channel_name"
 	create_lttng_session_ok "$SESSION_NAME" "$TRACE_PATH"
@@ -47,13 +47,7 @@ function test_channel_buffer_too_large()
 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