Fix: Tests: race condition in test_ns_contexts_change

[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..8a4b62ce3a4ff2a04542ae062ee2686b325ce632 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"
 
        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 --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")

 
        start_lttng_sessiond
 
 
        start_lttng_sessiond
 


@@ -79,6 +79,9 @@ function test_ns()
 
        touch "$file_sync_before_last"
 
 
        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"
        # stop and destroy
        stop_lttng_tracing_ok "$session_name"
        destroy_lttng_session_ok "$session_name"