X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fmi%2Ftest_mi;h=f6bc9b36f4524a3beb8aa932b29d659808b55161;hb=e8526e3f78384fdb3b72860dc4a8f180100e0c85;hp=0e8fa672fc00f6e059a3296942e36f5ef68e1746;hpb=5de63f6d18f9b58a65b50c8e773cc44a2bc37e0a;p=lttng-tools.git

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index 0e8fa672f..f6bc9b36f 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"
@@ -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"
 
 }
@@ -546,7 +544,9 @@ function test_list_ust_event ()
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
 
 	#Begin testing
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} & 2>/dev/null
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+		--sync-after-first-event ${file_sync_after_first} \
+		--sync-before-last-event ${file_sync_before_last} & 2>/dev/null
 
 	while [ ! -f "${file_sync_after_first}" ]; do
 		sleep 0.5
@@ -631,9 +631,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
@@ -748,7 +748,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 +905,7 @@ do
 	fi
 done
 rm -rf $OUTPUT_DIR
+rm -rf $FOO_LOAD_DIR
 
 OUTPUT_DEST=/dev/null 2>&1
 stop_lttng_sessiond