X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fmi%2Ftest_mi;h=6a2e99a602ca9b8e3191a5a14180ef2cb131d14f;hb=4d513dce5d26cbc477a00b348beb537d01231cd9;hp=e8c032ce52a75eff5bc9912299e46e62bbedff05;hpb=54897b571f12970647556f1ad73fc8e30db2258d;p=lttng-tools.git

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index e8c032ce5..6a2e99a60 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=224
+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"
 
 }
@@ -246,6 +244,28 @@ function test_list_sessions ()
 	destroy_lttng_sessions
 }
 
+function test_list_session_long_path ()
+{
+	local session_name="session_long_path"
+
+	output_basedir=$OUTPUT_DIR/$(randstring 254 0)
+	mkdir -p ${output_basedir}
+
+	OUTPUT_FILE="list_sessions.xml"
+
+	#Test build up
+	OUTPUT_DEST=$DEVNULL
+	create_lttng_session_ok $session_name ${output_basedir}
+
+	OUTPUT_DEST=${output_basedir}/$OUTPUT_FILE
+	list_lttng_with_opts
+	$XML_VALIDATE $OUTPUT_DEST
+	ok $? "Mi test: list session with long path xsd validation"
+
+	#Teardown
+	OUTPUT_DEST=$DEVNULL
+	destroy_lttng_sessions
+}
 function test_ust_channel ()
 {
 	local session_name="testsession"
@@ -609,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
@@ -621,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
@@ -856,7 +876,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
@@ -871,6 +903,8 @@ TESTS=(
 	test_start_stop
 	test_snapshot
 	test_track_untrack
+	test_list_session_long_path
+	test_add_context_list
 )