X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=9b93857c255569e7445d9d9f9a968d8eb6f1e0be;hb=030ccc250152b15afa188608e0952f79991a1ce3;hp=f2393b9cf69ea1370b65b1815b74c805e3a099ee;hpb=a9c2df2bfce7a27b53ee5d5101f259f3e1f506b1;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index f2393b9cf..9b93857c2 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -646,9 +646,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
@@ -703,7 +703,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
@@ -1237,7 +1236,7 @@ function lttng_snapshot_add_output ()
 	local sess_name=$2
 	local trace_path=$3
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
 	ret=$?
 	if [[ $expected_to_fail -eq 1 ]]; then
 		test "$ret" -ne "0"
@@ -1729,9 +1728,9 @@ function lttng_enable_rotation_timer ()
 	ret=$?
 	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
-		ok $? "Expected fail on rotate session $sess_name"
+		ok $? "Expected fail when setting periodic rotation ($period) of session $sess_name"
 	else
-		ok $ret "Rotate session $sess_name"
+		ok $ret "Set periodic rotation ($period) of session $sess_name"
 	fi
 }