Refactor: test: wrapper for destroy_lttng_session

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

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 198104d62374d5f93d6d7043d082d2c02ceea7a5..c6234efe1fce443e6f7573079db2f7e05b954983 100755 (executable)
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -54,7 +54,7 @@ function test_basic_load()
 
        lttng_load "-i $CURDIR/$SESSION_NAME.lttng"
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_complex_load()
@@ -83,14 +83,14 @@ function test_complex_load()
        if [ $? -ne 0 ]; then
                break;
        fi
-       lttng --mi XML list $sess -c chan2 > $mi_output_file
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi XML list $sess -c chan2 > $mi_output_file
        mi_result=$($CURDIR/../mi/extract_xml $mi_output_file "//command/output/sessions/session/domains/domain/channels/channel[name='chan2']/events/event[name='uevent_disabled']/enabled/text()")
        if [[ $mi_result = "false" ]]; then
            ok 0 "Disabled event is loaded in disabled state"
        else
            fail "Disabled event is loaded in disabled state"
        fi
-       destroy_lttng_session $sess
+       destroy_lttng_session_ok $sess
 
        stop_lttng_relayd_nocheck
 }
@@ -105,8 +105,8 @@ function test_all_load()
 
        lttng_load "-a -i $CURDIR"
 
-       destroy_lttng_session $SESSION_NAME
-       destroy_lttng_session "$SESSION_NAME-complex"
+       destroy_lttng_session_ok $SESSION_NAME
+       destroy_lttng_session_ok "$SESSION_NAME-complex"
 
        stop_lttng_relayd_nocheck
 }
@@ -120,7 +120,7 @@ function test_overwrite()
        # This one should succeed
        lttng_load "-f -i $CURDIR $SESSION_NAME"
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond