Tests: Consider lttng mi namespace in test_load

[lttng-tools.git] / tests / regression / tools / save-load / test_save

diff --git a/tests/regression/tools/save-load/test_save b/tests/regression/tools/save-load/test_save
index 299776fba121b29d9466d6105f8fd490aaed7c6d..467722e43b9e2f81e4329fec0a70d101f033f782 100755 (executable)
--- a/tests/regression/tools/save-load/test_save
+++ b/tests/regression/tools/save-load/test_save
@@ -29,7 +29,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=37
+NUM_TESTS=41
 
 source $TESTDIR/utils/utils.sh
 
@@ -68,12 +68,13 @@ function test_basic_save()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       lttng_track_ok "-p 666 -u -s $SESSION_NAME"
 
        lttng_save $SESSION_NAME "-o $TRACE_PATH"
 
        is_session_saved $TRACE_PATH $SESSION_NAME
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_basic_save_all()
@@ -92,15 +93,19 @@ function test_basic_save_all()
        enable_ust_lttng_event_ok $SESSION_NAME-2 $EVENT_NAME $CHANNEL_NAME
        enable_ust_lttng_event_ok $SESSION_NAME-3 $EVENT_NAME $CHANNEL_NAME
 
+       lttng_track_ok "-p 666 -u -s $SESSION_NAME-1"
+       lttng_track_ok "-p 666 -u -s $SESSION_NAME-2"
+       lttng_track_ok "-p 666 -u -s $SESSION_NAME-3"
+
        lttng_save "" "-a -o $TRACE_PATH"
 
        is_session_saved $TRACE_PATH $SESSION_NAME-1
        is_session_saved $TRACE_PATH $SESSION_NAME-2
        is_session_saved $TRACE_PATH $SESSION_NAME-3
 
-       destroy_lttng_session $SESSION_NAME-1
-       destroy_lttng_session $SESSION_NAME-2
-       destroy_lttng_session $SESSION_NAME-3
+       destroy_lttng_session_ok $SESSION_NAME-1
+       destroy_lttng_session_ok $SESSION_NAME-2
+       destroy_lttng_session_ok $SESSION_NAME-3
 }
 
 function test_overwrite()
@@ -115,7 +120,7 @@ function test_overwrite()
 
        is_session_saved $TRACE_PATH $SESSION_NAME
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Create a new session with same name so we can force the overwrite
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -130,7 +135,7 @@ function test_overwrite()
 
        is_session_saved $TRACE_PATH $SESSION_NAME
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond