Tests: utils: regroup xml utils to utils.sh

[lttng-tools.git] / tests / utils / utils.sh

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 6a25aec47ec05e62691794d18eea42fb2a3745de..517b96a5a8c3af76b13a109e8115ee6c0755e505 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -15,9 +15,14 @@ LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
 OUTPUT_DEST=/dev/null
 ERROR_OUTPUT_DEST=/dev/null
-MI_XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
-XML_PRETTY_BIN="$TESTDIR/utils/xml-utils/pretty_xml"
-XML_VALIDATE_BIN="$TESTDIR/utils/xml-utils/validate_xml"
+MI_XSD_MAJOR_VERSION=4
+MI_XSD_MINOR_VERSION=0
+MI_XSD_PATH="$TESTDIR/../src/common/mi-lttng-${MI_XSD_MAJOR_VERSION}.${MI_XSD_MINOR_VERSION}.xsd"
+MI_VALIDATE="$TESTDIR/utils/xml-utils/validate_xml ${MI_XSD_PATH}"
+
+XML_PRETTY="$TESTDIR/utils/xml-utils/pretty_xml"
+XML_EXTRACT="$TESTDIR/utils/xml-utils/extract_xml"
+XML_NODE_CHECK="${XML_EXTRACT} -e"
 
 # To match 20201127-175802
 date_time_pattern="[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]"
@@ -2292,9 +2297,9 @@ function list_triggers_matches_mi_ok ()
        ok $? "${test_name}: exit code is 0"
 
        # Pretty-fy xml before further test.
-       $XML_PRETTY_BIN < "${tmp_stdout_raw}" > "${tmp_stdout}"
+       $XML_PRETTY < "${tmp_stdout_raw}" > "${tmp_stdout}"
 
-       $XML_VALIDATE_BIN "${MI_XSD_PATH}" "${tmp_stdout}"
+       $MI_VALIDATE "${tmp_stdout}"
        ok $? "list-trigger mi is valid"
 
        diff -u "${expected_stdout_file}" "${tmp_stdout}"