X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmi%2Ftest_mi;h=ba0febf4281237ed09f907e0a943b1dc3002cb45;hb=9f0e230a68c5715f28372aa3df9ad1cb13cf6b43;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..ba0febf42 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"
@@ -32,7 +30,7 @@ NR_ITER=10000
 
 #Temp file output
 OUTPUT_DIR=$(mktemp -d)
-FOO_LOAD_DIR=$(mktemp -d)
+SESSIOND_LOAD_DIR=$(mktemp -d)
 OUTPUT_FILE="default.xml"
 
 #Path to custom xml utilities
@@ -59,7 +57,7 @@ DEVNULL=/dev/null 2>&1
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=228
+NUM_TESTS=230
 
 source $TESTDIR/utils/utils.sh
 
@@ -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
@@ -678,7 +676,7 @@ function test_snapshot () {
 	#Test fail command
 	#No channel enable start command should return element success false
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	lttng_snapshot_add_output_ok $session_name $snapshot_path
+	lttng_snapshot_add_output_ok $session_name file://$snapshot_path
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: snapshot xsd validation"
 
@@ -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"
 
@@ -878,7 +875,19 @@ function test_track_untrack ()
 	destroy_lttng_sessions
 }
 
-start_lttng_sessiond $FOO_LOAD_DIR
+function test_add_context_list()
+{
+	diag "Test context listing"
+
+	OUTPUT_FILE="list-context.xml"
+	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
+	lttng_add_context_list
+
+	$XML_VALIDATE $OUTPUT_DEST
+	ok $? "Mi test: context listing validation"
+}
+
+start_lttng_sessiond $SESSIOND_LOAD_DIR
 TESTS=(
 	test_version
 	test_create_session
@@ -894,6 +903,7 @@ TESTS=(
 	test_snapshot
 	test_track_untrack
 	test_list_session_long_path
+	test_add_context_list
 )
 
 
@@ -906,6 +916,7 @@ do
 	fi
 done
 rm -rf $OUTPUT_DIR
+rm -rf $FOO_LOAD_DIR
 
 OUTPUT_DEST=/dev/null 2>&1
 stop_lttng_sessiond