Tests: utils: regroup xml utils to utils.sh

[lttng-tools.git] / tests / regression / tools / relayd-grouping / test_ust

diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust
index 64fb90e348d25203816f0e90cd506e5d5dbfbea9..579881492123d31dd2f327bfdc3670749544b494 100755 (executable)
--- a/tests/regression/tools/relayd-grouping/test_ust
+++ b/tests/regression/tools/relayd-grouping/test_ust
@@ -16,15 +16,9 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 EVENT_NAME="tp:tptest"
 CHANNEL_NAME="my_channel"
 
 EVENT_NAME="tp:tptest"
 CHANNEL_NAME="my_channel"
 

-XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
-
-XML_VALIDATE="$TESTDIR/utils/xml-utils/validate_xml $XSD_PATH"
-XML_EXTRACT="$TESTDIR/utils/xml-utils/extract_xml"
-

 XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
 XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
 
 XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
 XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
 

-

 NUM_TESTS=688
 
 source "$TESTDIR/utils/utils.sh"
 NUM_TESTS=688
 
 source "$TESTDIR/utils/utils.sh"


@@ -43,7 +37,7 @@ function get_auto_session_name ()
        OUTPUT_DEST=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output.XXXXXX")
 
        list_lttng_with_opts
        OUTPUT_DEST=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output.XXXXXX")
 
        list_lttng_with_opts

-       $XML_VALIDATE "$OUTPUT_DEST"
+       $MI_VALIDATE "$OUTPUT_DEST"

        ok $? "Valid lttng list XML"
 
        value=$($XML_EXTRACT "$OUTPUT_DEST" ${XPATH_SESSION}/lttng:name/text\(\))
        ok $? "Valid lttng list XML"
 
        value=$($XML_EXTRACT "$OUTPUT_DEST" ${XPATH_SESSION}/lttng:name/text\(\))