X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmi%2Ftest_mi;h=209984ec32788bd6c4ba697f65a278fa56013513;hb=ea1f5ffb37fc9e88821e143bd2f4ca1e307e7067;hp=f3d2c330b6d0e79a90727659b10d77cd6ffa37f8;hpb=c764163f74aae77631737f756d7dad745df2dd66;p=lttng-tools.git

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index f3d2c330b..209984ec3 100755
--- 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"
@@ -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
@@ -748,7 +746,6 @@ function test_track_untrack ()
 	diag "Test track/untrack pid"
 
 	local session_name="testTrack"
-	local snapshot_path="$OUTPUT_DIR/trackoutput"
 	local pid="1,2,3"
 	OUTPUT_FILE="track.xml"
 
@@ -906,6 +903,7 @@ do
 	fi
 done
 rm -rf $OUTPUT_DIR
+rm -rf $FOO_LOAD_DIR
 
 OUTPUT_DEST=/dev/null 2>&1
 stop_lttng_sessiond