X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_ns_contexts_change;h=42a61276be2222f0ef9e4c2ef61131be8a1018b2;hb=c10f9cdd994258358bb3766c2e92dab71e4ceef2;hp=905f6cf2bb01bd1efe349534493fe004ed6386d9;hpb=5f0d4e78e640b8baaf900fe52f491155ad6d8168;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_ns_contexts_change b/tests/regression/kernel/test_ns_contexts_change
index 905f6cf2b..42a61276b 100755
--- a/tests/regression/kernel/test_ns_contexts_change
+++ b/tests/regression/kernel/test_ns_contexts_change
@@ -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 change"
 
@@ -91,10 +80,10 @@ function test_ns()
 		return
 	fi
 
-	trace_path=$(mktemp -d)
-	file_sync_wait_before_unshare=$(mktemp -u)
-	file_sync_wait_after_unshare=$(mktemp -u)
-	file_sync_signal_after_unshare=$(mktemp -u)
+	trace_path=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	file_sync_wait_before_unshare=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_unshare.XXXXXX")
+	file_sync_wait_after_unshare=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_unshare.XXXXXX")
+	file_sync_signal_after_unshare=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_signal_after_unshare.XXXXXX")
 
 	# Get the current ns inode number
 	ns_inode=$(stat -c '%i' -L "/proc/$$/ns/$ns")
@@ -119,13 +108,11 @@ function test_ns()
 
 		touch "$file_sync_wait_before_unshare"
 
-		# Let the app do it's thing before entering the synchronisation loop
-		sleep 0.5
-
 		while [ ! -f "$file_sync_signal_after_unshare" ]; do
 			# Break if the app failed / died
-			if [ ! -f "/proc/$app_pid" ]; then
+			if ! kill -0 "$app_pid" ; then
 				break
+				echo "# App failed"
 			fi
 			echo "# Waiting for app..."
 			sleep 0.5
@@ -144,8 +131,22 @@ function test_ns()
 		# Check that the events contain the right namespace inode number
 		validate_trace_count "${ns}_ns = $app_ns_inode" "$trace_path" 1
 		validate_trace_count "${ns}_ns = $app_unshare_ns_inode" "$trace_path" 1
+	else
+		touch "$file_sync_wait_before_unshare"
+
+		while [ ! -f "$file_sync_signal_after_unshare" ]; do
+			# Break if the app failed / died
+			if ! kill -0 "$app_pid" ; then
+				break
+				echo "# App failed"
+			fi
+			echo "# Waiting for app..."
+			sleep 0.5
+		done
+		touch "$file_sync_wait_after_unshare"
 	fi
 
+
 	# stop and destroy
 	destroy_lttng_session_ok "$session_name"
 	stop_lttng_sessiond
@@ -185,5 +186,7 @@ test_ns ipc
 test_ns mnt
 test_ns net
 #test_ns pid # pid_ns is special, can't be changed that way
+#test_ns time # time_ns is special, can't be changed that way
 test_ns user
 test_ns uts
+set +x