X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fnamespaces%2Ftest_ns_contexts_change;h=ac14748ee1cb93de842cbd55aaac98542812db61;hp=c0af15e95da10c34c05ed368397ca912d210a326;hb=HEAD;hpb=33e557114a2ba28e26e220a833e8a449c78b8b65

diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change
index c0af15e95..ac14748ee 100755
--- a/tests/regression/ust/namespaces/test_ns_contexts_change
+++ b/tests/regression/ust/namespaces/test_ns_contexts_change
@@ -46,9 +46,9 @@ function test_ns()
 	ns_inode=$(stat -c '%i' -L "/proc/$$/ns/$ns")
 	ok $? "Get current $ns namespace inode: $ns_inode" || ns_inode="invalid"
 
-	trace_path=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
-	file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
-	file_sync_after_unshare=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_unshare.XXXXXX")
+	trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	file_sync_before_last=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
+	file_sync_after_unshare=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_after_unshare.XXXXXX")
 
 	start_lttng_sessiond
 
@@ -79,6 +79,9 @@ function test_ns()
 
 	touch "$file_sync_before_last"
 
+	# Wait for the test app to generate all expected events and exit.
+	wait $app_pid
+
 	# stop and destroy
 	stop_lttng_tracing_ok "$session_name"
 	destroy_lttng_session_ok "$session_name"
@@ -98,12 +101,9 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-isroot=0
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-fi
+bail_out_if_no_babeltrace
 
-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