Gen-ust-events: use options instead of arguments

[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 0d3bd4f6d5d853da1e7ffbfd7cc05d35c7b33dcf..5ae71c745f0911ef59155d1f7bf48462f4250313 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"
@@ -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
 
@@ -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
@@ -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"
 
@@ -878,7 +877,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 +905,7 @@ TESTS=(
        test_snapshot
        test_track_untrack
        test_list_session_long_path
+       test_add_context_list
 )
 
 
@@ -906,6 +918,7 @@ do
        fi
 done
 rm -rf $OUTPUT_DIR
+rm -rf $FOO_LOAD_DIR
 
 OUTPUT_DEST=/dev/null 2>&1
 stop_lttng_sessiond