Tests: remove declaration already present in utils.sh

[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 f3d2c330b6d0e79a90727659b10d77cd6ffa37f8..875dbb99a480f834433cb4209fbc3db681eba113 100755 (executable)
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -20,8 +20,6 @@ TEST_DESC="Machine interface testing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
 XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
 
 #Test app for ust event
 TESTAPP_PATH="$TESTDIR/utils/testapp"
@@ -132,10 +130,10 @@ function is_command_success ()
 
 function mi_print_version ()
 {
-       local opt=$2
        local output_path=$1
+       local opt=$2
 
-       $LTTNG version $opt > $1
+       $LTTNG version $opt > $output_path
        ok $? "MI test: Lttng version"
 
 }
@@ -631,9 +629,9 @@ function test_start_stop () {
        ok $? "Mi test: enabled element : $result expected: true"
 
        #Test metadata regenerate command
-       metadata_regenerate_ok $session_name
+       regenerate_metadata_ok $session_name
        $XML_VALIDATE $OUTPUT_DEST
-       ok $? "Mi test: metadata regenerate"
+       ok $? "Mi test: regenerate metadata"
 
        #Test stop command
        stop_lttng_tracing_ok $session_name
@@ -643,7 +641,7 @@ function test_start_stop () {
        #Extract session name from xml
        extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:name/text()" result
        test "$result" = "$session_name"
-       ok $? "Mi test: stoped $session_name"
+       ok $? "Mi test: stopped $session_name"
 
        #Extract enabled expect false
        extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:enabled/text()" result