X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=5e10df5ce124ece0745df3f146d9c79b1efb7701;hb=b135036695ff1da495d6d3fe952ad12895915344;hp=89aca464002d9b950571852b244b4b392cffb8a6;hpb=ef2117d4b988197f140083fafd95c84ff2c3f23f;p=lttng-tools.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 89aca4640..5e10df5ce 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 @@ -1455,7 +1454,7 @@ function regenerate_statedump () test "$ret" -ne "0" ok $? "Expected fail on regenerate statedump $sess_name" else - ok $ret "Metadata regenerate $sess_name" + ok $ret "Statedump regenerate $sess_name" fi }