X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=a7bf49f181f7ff0262648c106276afa7e78118ec;hb=899f6394284390ceb3421f530222ab91a1053666;hp=89aca464002d9b950571852b244b4b392cffb8a6;hpb=8f3cea4d21c76f39a403da4ad8276b8c75218b7f;p=lttng-tools.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 89aca4640..a7bf49f18 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -550,9 +550,9 @@ function stop_lttng_consumerd_opt() if [ $withtap -eq "1" ]; then diag "Killing $CONSUMERD_BIN pids: $(echo $PID_CONSUMERD | tr '\n' ' ')" fi + kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST retval=$? - set +x if [ $? -eq 1 ]; then if [ $withtap -eq "1" ]; then @@ -607,7 +607,6 @@ function sigstop_lttng_consumerd_opt() fi kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST retval=$? - set +x if [ $? -eq 1 ]; then if [ $withtap -eq "1" ]; then