Tests: add kernel test into the `make check` test suite.

[lttng-tools.git] / tests / regression / kernel / test_ns_contexts_change

diff --git a/tests/regression/kernel/test_ns_contexts_change b/tests/regression/kernel/test_ns_contexts_change
index 118d120a61942e479b80d513cb4d925201ecaca6..42a61276be2222f0ef9e4c2ef61131be8a1018b2 100755 (executable)
--- a/tests/regression/kernel/test_ns_contexts_change
+++ b/tests/regression/kernel/test_ns_contexts_change
@@ -80,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")
@@ -131,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
@@ -175,3 +189,4 @@ test_ns net
 #test_ns time # time_ns is special, can't be changed that way
 test_ns user
 test_ns uts
+set +x