From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 19 Nov 2014 21:40:31 +0000 (+0100)
Subject: Fix: tests: wait output hide Terminate errors
X-Git-Tag: v2.6.0~8
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f6d8a3653003fdb3294fa528eb03fae8af3ea32d;p=lttng-tools.git

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 bf5e79c57..4b958dff8 100755
--- 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 4026bba64..ae6919585 100755
--- 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 3ef2ee1e9..68e3722a8 100755
--- 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 fa46b514e..e690822b5 100755
--- 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 ad0c56b19..55c1087d9 100755
--- 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 d8ab18880..552eed231 100755
--- 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 add8ff140..3a8af98a7 100755
--- 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 -
 }