X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Futils%2Futils.sh;h=8a710fe303b10c7aa69950a9e2da6cae85823079;hb=4ae042345b4094e98611744d9ba6c92265058fdb;hp=c6d627cef40134efdefd7e3c0c6b916215adf3a4;hpb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index c6d627cef..8a710fe30 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -682,8 +682,8 @@ function start_lttng_sessiond_opt()
 	    LTTNG_BAIL_OUT "*** Kernel too old for session daemon tests ***"
 	fi
 
-	diag "export LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/"
-	: "${LTTNG_SESSION_CONFIG_XSD_PATH="${DIR}/../src/common/config/"}"
+	diag "export LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/"
+	: "${LTTNG_SESSION_CONFIG_XSD_PATH="${DIR}/../src/common/"}"
 	export LTTNG_SESSION_CONFIG_XSD_PATH
 
 	if [ -z "$(lttng_pgrep "${SESSIOND_MATCH}")" ]; then
@@ -1028,10 +1028,26 @@ function sigstop_lttng_consumerd_notap()
 
 function list_lttng_with_opts ()
 {
+	local ret
+	local withtap=$1
+	shift
 	local opts=$1
 	_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
 		list $opts
-	ok $? "Lttng-tool list command with option $opts"
+	ret=$?
+	if [ $withtap -eq "1" ]; then
+		ok $ret "Lttng-tool list command with option $opts"
+	fi
+}
+
+function list_lttng_ok ()
+{
+	list_lttng_with_opts 1 "$@"
+}
+
+function list_lttng_notap ()
+{
+	list_lttng_with_opts 0 "$@"
 }
 
 function create_lttng_session_no_output ()