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>
Conflicts:
tests/regression/tools/mi/test_mi
# Kill the relayd
PID_RELAYD=`pidof lt-$RELAYD_BIN`
# Kill the relayd
PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD >/dev/null 2>&1
if [ $? -eq 1 ]; then
echo "Kill lttng-relayd (pid: $PID_RELAYD)"
exit 1
if [ $? -eq 1 ]; then
echo "Kill lttng-relayd (pid: $PID_RELAYD)"
exit 1
# Kill the sessiond
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
# Kill the sessiond
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND >/dev/null 2>&1
if [ $? -eq 1 ]; then
echo "Kill sessiond daemon"
exit 1
if [ $? -eq 1 ]; then
echo "Kill sessiond daemon"
exit 1
# Kill the relayd
PID_RELAYD=`pidof lt-$RELAYD_BIN`
# Kill the relayd
PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD >/dev/null 2>&1
if [ $? -eq 1 ]; then
echo "Kill lttng-relayd (pid: $PID_RELAYD)"
exit 1
if [ $? -eq 1 ]; then
echo "Kill lttng-relayd (pid: $PID_RELAYD)"
exit 1
# Kill the sessiond
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
# Kill the sessiond
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND >/dev/null 2>&1
if [ $? -eq 1 ]; then
echo "Kill sessiond daemon"
exit 1
if [ $? -eq 1 ]; then
echo "Kill sessiond daemon"
exit 1
# Kill the relayd
PID_RELAYD=`pidof lt-$RELAYD_BIN`
# Kill the relayd
PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD >/dev/null 2>&1
if [ $? -eq 1 ]; then
echo "Kill lttng-relayd (pid: $PID_RELAYD)"
exit 1
if [ $? -eq 1 ]; then
echo "Kill lttng-relayd (pid: $PID_RELAYD)"
exit 1
# Kill the sessiond
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
# Kill the sessiond
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND >/dev/null 2>&1
if [ $? -eq 1 ]; then
echo "Kill sessiond daemon"
exit 1
if [ $? -eq 1 ]; then
echo "Kill sessiond daemon"
exit 1
diag "Stopping $TESTAPP_NAME"
for p in ${APPS_PID}; do
kill ${p}
diag "Stopping $TESTAPP_NAME"
for p in ${APPS_PID}; do
kill ${p}
diag "Stopping $TESTAPP_NAME"
for p in ${APPS_PID}; do
kill ${p}
diag "Stopping $TESTAPP_NAME"
for p in ${APPS_PID}; do
kill ${p}
cd $CURDIR/demo
# Start test
cd $CURDIR/demo
# Start test
+ diag "Running application"
./demo-trace >/dev/null 2>&1
./demo-trace >/dev/null 2>&1
- ok $? "Start application"
+ ok $? "Application done"