tests: Make test_per_application_leaks more robust

[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 a4dce0951c8a44d2861a1dfa799a595caf796c24..94c98c9883a0cca7d1e5d04caf4ab07fcd14b2fe 100755 (executable)
--- a/tests/regression/tools/rotation/test_save_load_mi
+++ b/tests/regression/tools/rotation/test_save_load_mi
@@ -28,9 +28,9 @@ XPATH_LIST_ROTATE_SIZE="$XPATH_SESSION/lttng:rotation_schedules/lttng:size_thres
 
 function test_save_load_mi ()
 {
-       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")
+       local tmp_xml_output=$(mktemp -u -t "tmp.${FUNCNAME[0]}_xml_output.XXXXXX")
+       local tmp_save_output=$(mktemp -d -t "tmp.${FUNCNAME[0]}_save_output.XXXXXX")
+       local trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 
        diag "Test save/load/list/MI with rotation"
        create_lttng_session_ok $SESSION_NAME $trace_path
@@ -57,7 +57,7 @@ function test_save_load_mi ()
        ok $? "Found the right rotation size value in XML"
 
        # Check the output of lttng list with the 2 rotation parameters
-       list_lttng_with_opts $SESSION_NAME
+       list_lttng_ok $SESSION_NAME
        $MI_VALIDATE ${tmp_xml_output}
        ok $? "Valid lttng list XML"
 
@@ -77,7 +77,7 @@ function test_save_load_mi ()
 
        OUTPUT_DEST=${tmp_xml_output}
        # Check the output of lttng list with the 2 rotation parameters after the load
-       list_lttng_with_opts $SESSION_NAME
+       list_lttng_ok $SESSION_NAME
        $MI_VALIDATE ${tmp_xml_output}
        ok $? "Valid lttng list XML after load"