Move xml utils from mi subfolder to xml-utils folder

[lttng-tools.git] / tests / regression / tools / rotation / test_save_load_mi

diff --git a/tests/regression/tools/rotation/test_save_load_mi b/tests/regression/tools/rotation/test_save_load_mi
index 92146afebef1a0bd5544bb994e17161d21e46ab9..cb205084111569eaa81de1650ed3af18a01a47a0 100755 (executable)
--- a/tests/regression/tools/rotation/test_save_load_mi
+++ b/tests/regression/tools/rotation/test_save_load_mi
@@ -20,8 +20,8 @@ LTTNG_BIN="lttng --mi xml"
 
 XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
 
-XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH"
-XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml"
+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"
@@ -33,9 +33,9 @@ XPATH_LIST_ROTATE_SIZE="$XPATH_SESSION/lttng:rotation_schedules/lttng:size_thres
 
 function test_save_load_mi ()
 {
-       tmp_xml_output=$(mktemp -u)
-       tmp_save_output=$(mktemp -d)
-       trace_path=$(mktemp -d)
+       local tmp_xml_output=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_xml_output.XXXXXX")
+       local tmp_save_output=$(mktemp --tmpdir -d -t "tmp.${FUNCNAME[0]}_save_output.XXXXXX")
+       local trace_path=$(mktemp --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 
        diag "Test save/load/list/MI with rotation"
        create_lttng_session_ok $SESSION_NAME $trace_path
@@ -76,9 +76,9 @@ function test_save_load_mi ()
 
        # save, destroy and reload the same session
        OUTPUT_DEST=/dev/null
-       lttng_save $SESSION_NAME "-o $tmp_save_output$SESSION_NAME"
+       lttng_save $SESSION_NAME "-o $tmp_save_output/$SESSION_NAME"
        destroy_lttng_session_ok $SESSION_NAME
-       lttng_load_ok "-i $tmp_save_output$SESSION_NAME"
+       lttng_load_ok "-i $tmp_save_output/$SESSION_NAME"
 
        OUTPUT_DEST=${tmp_xml_output}
        # Check the output of lttng list with the 2 rotation parameters after the load
@@ -97,9 +97,9 @@ function test_save_load_mi ()
        OUTPUT_DEST=/dev/null
        destroy_lttng_session_ok $SESSION_NAME
 
-       rm -rf ${trace_path}
-       rm $tmp_xml_output
-       rm -rf $tmp_save_output
+       rm -rf "$trace_path"
+       rm "$tmp_xml_output"
+       rm -rf "$tmp_save_output"
 }
 
 plan_tests $NUM_TESTS