Move xml utils from mi subfolder to xml-utils folder

[lttng-tools.git] / tests / regression / tools / mi / test_mi

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index 46a9e91808c87bf2a628033b8c0c4c7615fae79b..b3b637865456174b3235164b2d396edc52a9b0c6 100755 (executable)
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -18,14 +18,15 @@ NR_USEC_WAIT=0
 NR_ITER=10000
 
 #Temp file output
-OUTPUT_DIR=$(mktemp -d)
-SESSIOND_LOAD_DIR=$(mktemp -d)
+OUTPUT_DIR=$(mktemp --tmpdir -d tmp.test_mi_output_dir.XXXXXX)
+SESSIOND_LOAD_DIR=$(mktemp --tmpdir -d tmp.test_mi_sessiond_load_dir.XXXXXX)
 OUTPUT_FILE="default.xml"
 
 #Path to custom xml utilities
-XML_VALIDATE="$CURDIR/validate_xml $XSD_PATH"
-XML_EXTRACT="$CURDIR/extract_xml"
-XML_NODE_CHECK="$CURDIR/extract_xml -e"
+XML_UTILS_PATH="$TESTDIR/utils/xml-utils"
+XML_VALIDATE="$XML_UTILS_PATH/validate_xml $XSD_PATH"
+XML_EXTRACT="$XML_UTILS_PATH/extract_xml"
+XML_NODE_CHECK="$XML_UTILS_PATH/extract_xml -e"
 
 XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
 XPATH_COMMAND_SUCCESS="/lttng:command/lttng:success/text()"
@@ -524,8 +525,8 @@ function test_list_session ()
 
 function test_list_ust_event ()
 {
-       local file_sync_after_first=$(mktemp -u)
-       local file_sync_before_last=$(mktemp -u)
+       local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+       local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
        OUTPUT_FILE="list_ust_event.xml"