trackers: update list/track/untrack commands

[lttng-tools.git] / tests / regression / tools / save-load / test_load

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 2e51b2e0d2261133f5c34462baff945b44bae899..1f1d01d256d900dfb9b46f987a3ea47cbdd3d317 100755 (executable)
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -20,9 +20,6 @@ TEST_DESC="Load session(s)"
 CURDIR=$(dirname $0)/
 CONFIG_DIR="${CURDIR}/configuration"
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
 export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/)
 
 SESSION_NAME="load-42"
@@ -30,7 +27,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=67
+NUM_TESTS=72
 
 source $TESTDIR/utils/utils.sh
 
@@ -97,6 +94,7 @@ function test_complex_load()
 
        destroy_lttng_session_ok $sess
 
+       rm $mi_output_file
        stop_lttng_relayd
        rm -rf ${mi_output_file}
 }
@@ -142,18 +140,36 @@ function test_trackers()
                break;
        fi
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi XML list "$SESSION_NAME-trackers" > $mi_output_file
-       mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:pid_tracker/lttng:targets/lttng:pid_target")
+       mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:vpid_tracker/lttng:targets/lttng:vpid_target")
        if [[ $mi_result = "true" ]]; then
-           ok 0 "Pid target is present"
+           ok 0 "VPID target is present"
        else
-           fail "Pid target missing"
+           fail "VPID target missing"
+       fi
+
+       mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:vuid_tracker/lttng:targets/lttng:vuid_target")
+       if [[ $mi_result = "true" ]]; then
+           ok 0 "VUID target is present"
+       else
+           fail "VUID target missing"
+       fi
+
+       mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:vgid_tracker/lttng:targets/lttng:vgid_target")
+       if [[ $mi_result = "true" ]]; then
+           ok 0 "VGID target is present"
+       else
+           fail "VGID target missing"
        fi
 
        # Test to remove the target just to make sure
-       lttng_untrack_ok "-p 666 -u -s $SESSION_NAME-trackers"
+       lttng_untrack_ok "--vpid 666 -u -s $SESSION_NAME-trackers"
+       lttng_untrack_ok "--vuid 777 -u -s $SESSION_NAME-trackers"
+       lttng_untrack_ok "--vgid 888 -u -s $SESSION_NAME-trackers"
+       # Actually using vpid (backward compat)
+       lttng_untrack_ok "--pid 999 -u -s $SESSION_NAME-trackers"
 
        destroy_lttng_session_ok "$SESSION_NAME-trackers"
-       rm -rf ${mi_output_file}
+       rm -f ${mi_output_file}
 }
 
 function test_override_url_normal()