Fix: tests: wait output hide Terminate errors

Also: Don't hide kill errors.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel
index bf5e79c574381dbd45f606d943dfdbc6a5775429..4b958dff8ee6761d336b94beb248d2fd9a6a7078 100755 (executable)
--- a/tests/regression/tools/live/test_kernel
+++ b/tests/regression/tools/live/test_kernel
@@ -88,7 +88,7 @@ clean_live_tracing
 
 # Kill the relayd
 PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD >/dev/null 2>&1
+kill $PID_RELAYD
 if [ $? -eq 1 ]; then
        echo "Kill lttng-relayd (pid: $PID_RELAYD)"
        exit 1
@@ -102,7 +102,7 @@ fi
 
 # Kill the sessiond
 PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND >/dev/null 2>&1
+kill $PID_SESSIOND
 if [ $? -eq 1 ]; then
        echo "Kill sessiond daemon"
        exit 1

diff --git a/tests/regression/tools/live/test_ust b/tests/regression/tools/live/test_ust
index 4026bba647143f5a3575575b53050237032a9d61..ae6919585f3d1c377dc8ad432271cf5544bf0e86 100755 (executable)
--- a/tests/regression/tools/live/test_ust
+++ b/tests/regression/tools/live/test_ust
@@ -88,7 +88,7 @@ clean_live_tracing
 
 # Kill the relayd
 PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD >/dev/null 2>&1
+kill $PID_RELAYD
 if [ $? -eq 1 ]; then
        echo "Kill lttng-relayd (pid: $PID_RELAYD)"
        exit 1
@@ -102,7 +102,7 @@ fi
 
 # Kill the sessiond
 PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND >/dev/null 2>&1
+kill $PID_SESSIOND
 if [ $? -eq 1 ]; then
        echo "Kill sessiond daemon"
        exit 1

diff --git a/tests/regression/tools/live/test_ust_tracefile_count b/tests/regression/tools/live/test_ust_tracefile_count
index 3ef2ee1e9627c9ccc7188f24aa7b9b2786ed271d..68e3722a82f5ea28e3ddd257db31480d804e0359 100755 (executable)
--- a/tests/regression/tools/live/test_ust_tracefile_count
+++ b/tests/regression/tools/live/test_ust_tracefile_count
@@ -89,7 +89,7 @@ clean_live_tracing
 
 # Kill the relayd
 PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD >/dev/null 2>&1
+kill $PID_RELAYD
 if [ $? -eq 1 ]; then
        echo "Kill lttng-relayd (pid: $PID_RELAYD)"
        exit 1
@@ -103,7 +103,7 @@ fi
 
 # Kill the sessiond
 PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND >/dev/null 2>&1
+kill $PID_SESSIOND
 if [ $? -eq 1 ]; then
        echo "Kill sessiond daemon"
        exit 1

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index fa46b514ef90d98dfee68b220be3d9afd81eb4c1..e690822b5661ad3938c3ba43fe6ec3cdbc8fdc07 100755 (executable)
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -523,9 +523,8 @@ function test_list_ust_event ()
        test "$num" -eq "12"
        ok $? "Mi test: $num / 12 ust event fields discovered"
 
-       #Wait for last forked process
-       wait $!
-
+       #Wait for all background processes
+       wait
 }
 
 function test_start_stop () {
@@ -603,7 +602,6 @@ function test_start_stop () {
        #Teardown
        OUTPUT_DEST=$DEVNULL
        destroy_lttng_sessions
-
 }
 
 function test_snapshot () {

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index ad0c56b19c36550d48ce2afe2b0e954d30341532..55c1087d9e673ae0aae50e65eb87e10aa23faef1 100755 (executable)
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -80,7 +80,7 @@ function stop_test_apps()
        diag "Stopping $TESTAPP_NAME"
        for p in ${APPS_PID}; do
                kill ${p}
-               wait ${p} 2>&1
+               wait ${p} 2>/dev/null
        done
        APPS_PID=
 }

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 69feb9494a35b0e39e1f424b509f4d4011e6e0ad..1541e6e1e745b3272e318d76f47f0f4cdf6c3b9d 100755 (executable)
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -71,7 +71,7 @@ function stop_test_apps()
        diag "Stopping $TESTAPP_NAME"
        for p in ${APPS_PID}; do
                kill ${p}
-               wait ${p} 2>&1
+               wait ${p} 2>/dev/null
        done
        APPS_PID=
 }

diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap
index add8ff140ee5f3bc4c4e9fab33c8f2e29658f9cf..3a8af98a72f18343493cd6e737b1c90b95c4e3f0 100755 (executable)
--- a/tests/regression/ust/overlap/test_overlap
+++ b/tests/regression/ust/overlap/test_overlap
@@ -45,8 +45,9 @@ run_demo_app()
        cd $CURDIR/demo
 
        # Start test
+       diag "Running application"
        ./demo-trace >/dev/null 2>&1
-       ok $? "Start application"
+       ok $? "Application done"
 
        cd -
 }