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 905f6cf2bb01bd1efe349534493fe004ed6386d9..326eb25c46126eb9408895750645529b2bf45f3e 100755 (executable)
--- 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"
 
@@ -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
@@ -187,3 +188,4 @@ test_ns net
 #test_ns pid # pid_ns is special, can't be changed that way
 test_ns user
 test_ns uts
+set +x