Also: Don't hide kill errors.
Signed-off-by: Mathieu Desnoyers <[email protected]>
---
tests/regression/tools/live/test_kernel | 4 ++--
tests/regression/tools/live/test_ust | 4 ++--
tests/regression/tools/live/test_ust_tracefile_count | 4 ++--
tests/regression/tools/mi/test_mi | 6 ++----
tests/regression/tools/snapshots/test_ust_streaming | 2 +-
tests/regression/tools/snapshots/ust_test | 2 +-
tests/regression/ust/overlap/test_overlap | 3 ++-
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/tests/regression/tools/live/test_kernel
b/tests/regression/tools/live/test_kernel
index bf5e79c..4b958df 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 4026bba..ae69195 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 3ef2ee1..68e3722 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 fa46b51..e690822 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 ad0c56b..55c1087 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 69feb94..1541e6e 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 add8ff1..3a8af98 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 -
}
--
2.1.1
_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
