X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=454627eaae3ad6115b598f3067d1f81410899631;hp=f9df77bb0ec69050a5608c447e19ef03b44b041f;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hpb=e563bbdb8fa6592790e9ac4e9db7d9decf022023

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index f9df77bb0..454627eaa 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -686,12 +686,12 @@ function start_lttng_tracing_fail ()
 
 function stop_lttng_tracing ()
 {
-	local sess_name=$1
-	local expected_to_fail=$2
+	local expected_to_fail=$1
+	local sess_name=$2
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
 	ret=$?
-	if [[ $expected_to_fail ]]; then
+	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
 		ok $? "Expected fail on stop tracing for session: $sess_name"
 	else
@@ -699,14 +699,24 @@ function stop_lttng_tracing ()
 	fi
 }
 
+function stop_lttng_tracing_ok ()
+{
+	stop_lttng_tracing 0 "$@"
+}
+
+function stop_lttng_tracing_fail ()
+{
+	stop_lttng_tracing 1 "$@"
+}
+
 function destroy_lttng_session ()
 {
-	local sess_name=$1
-	local expected_to_fail=$2
+	local expected_to_fail=$1
+	local sess_name=$2
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
 	ret=$?
-	if [[ $expected_to_fail ]]; then
+	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
 		ok $? "Expected fail on session deletion $sess_name"
 	else
@@ -714,6 +724,18 @@ function destroy_lttng_session ()
 	fi
 }
 
+function destroy_lttng_session_ok ()
+{
+	destroy_lttng_session 0 "$@"
+
+}
+
+function destroy_lttng_session_fail ()
+{
+	destroy_lttng_session 1 "$@"
+}
+
+
 function destroy_lttng_sessions ()
 {
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST