X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_channel;h=6c7d2db0791bdbb810bb1ccd9b71bf5a1e11341b;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=cb0fa5183e87fcfb0f4383c38e83f1b9b3553a38;hpb=09b72f7aa737f46196db18bcdf3bc947a08c27a2;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_channel b/tests/regression/kernel/test_channel
index cb0fa5183..6c7d2db07 100755
--- a/tests/regression/kernel/test_channel
+++ b/tests/regression/kernel/test_channel
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2018 Francis Deslauriers <francis.deslauriers@efficios.com>
+# Copyright (C) 2018 Francis Deslauriers <francis.deslauriers@efficios.com>
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 TEST_DESC="Kernel tracer - Channel configuration"
 
@@ -25,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"
@@ -40,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"
@@ -57,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