Tests: trigger: mi: use utils.sh xsd versions for xml diff

[lttng-tools.git] / tests / regression / tools / trigger / test_remove_trigger_cli

diff --git a/tests/regression/tools/trigger/test_remove_trigger_cli b/tests/regression/tools/trigger/test_remove_trigger_cli
index f306f114f54d294769d3cf3c7fbc45e8cfa3fbb5..aafbe4e24df1eec858ccd229ca9c92936a6467c7 100755 (executable)
--- a/tests/regression/tools/trigger/test_remove_trigger_cli
+++ b/tests/regression/tools/trigger/test_remove_trigger_cli
@@ -80,7 +80,7 @@ function test_mi ()
 
        cat > "${tmp_expected_stdout}" <<- EOF
        <?xml version="1.0" encoding="UTF-8"?>
-       <command xmlns="https://lttng.org/xml/ns/lttng-mi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://lttng.org/xml/ns/lttng-mi https://lttng.org/xml/schemas/lttng-mi/4/lttng-mi-4.0.xsd" schemaVersion="4.0">
+       <command xmlns="https://lttng.org/xml/ns/lttng-mi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://lttng.org/xml/ns/lttng-mi https://lttng.org/xml/schemas/lttng-mi/${MI_XSD_MAJOR_VERSION}/lttng-mi-${MI_XSD_MAJOR_VERSION}.${MI_XSD_MINOR_VERSION}.xsd" schemaVersion="${MI_XSD_MAJOR_VERSION}.${MI_XSD_MINOR_VERSION}">
          <name>remove-trigger</name>
          <output>
            <trigger>
@@ -124,9 +124,9 @@ function test_mi ()
        ok $? "remove-trigger mi: 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 $? "remove-trigger mi is valid"
 
        diff -u "${tmp_expected_stdout}" "${tmp_stdout}"