X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_ns_contexts;h=98b673c98e94c2f31b1ef3bd446fe9c370e4a2f5;hp=843019a8eab5fb1d5bcc9e0d920d8a1082fd4e05;hb=HEAD;hpb=f62a387121da010bde3f50b1276cb7c1139321d1

diff --git a/tests/regression/kernel/test_ns_contexts b/tests/regression/kernel/test_ns_contexts
index 843019a8e..1c71ea503 100755
--- a/tests/regression/kernel/test_ns_contexts
+++ b/tests/regression/kernel/test_ns_contexts
@@ -2,18 +2,7 @@
 #
 # Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library 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 Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
 
 TEST_DESC="Kernel tracer - Namespace contexts"
 
@@ -22,7 +11,7 @@ TESTDIR=$CURDIR/../..
 
 TESTS_PER_NS=11
 
-NUM_TESTS=$((TESTS_PER_NS * 7))
+NUM_TESTS=$((TESTS_PER_NS * 8))
 
 source "$TESTDIR/utils/utils.sh"
 
@@ -87,7 +76,7 @@ function test_ns()
 	ns_inode=$(stat -c '%i' -L "/proc/$$/ns/$ns")
 	ok $? "Get current $ns namespace inode: $ns_inode"
 
-	trace_path=$(mktemp -d)
+	trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 
 	start_lttng_sessiond
 
@@ -119,13 +108,7 @@ plan_tests $NUM_TESTS
 print_test_banner "$TEST_DESC"
 
 
-isroot=0
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-fi
-
-skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" && exit 0
-
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." && exit 0
 
 system_has_ns=0
 if [ -d "/proc/$$/ns" ]; then
@@ -142,5 +125,6 @@ test_ns ipc
 test_ns mnt
 test_ns net
 test_ns pid
+test_ns time
 test_ns user
 test_ns uts