Clean-up: consumer.hpp: coding style indentation fix

[lttng-tools.git] / tests / regression / ust / namespaces / test_ns_contexts_change

diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change
index 6ce614aba905468e8443407c57d251688092f888..ac14748ee1cb93de842cbd55aaac98542812db61 100755 (executable)
--- 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 -d)
-       file_sync_before_last=$(mktemp -u)
-       file_sync_after_unshare=$(mktemp -u)
+       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