X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_save_load_mi;h=fc3b248910f585a6239d6d4814ea574a1e8e7f4b;hb=ffd85c6e61897e7dcb5d6926dfbad46928c01aee;hp=92146afebef1a0bd5544bb994e17161d21e46ab9;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/test_save_load_mi b/tests/regression/tools/rotation/test_save_load_mi
index 92146afeb..fc3b24891 100755
--- a/tests/regression/tools/rotation/test_save_load_mi
+++ b/tests/regression/tools/rotation/test_save_load_mi
@@ -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