X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_load;h=8b4bc2ac859443e7366251cb23e62bc7940a59c5;hb=40f1bcbe2678793744ef1f365c5a7ab25f003121;hp=2e51b2e0d2261133f5c34462baff945b44bae899;hpb=7f1c1f8fbc1dfa95ee5d4306d5321eaa419ef881;p=deliverable%2Flttng-tools.git

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 2e51b2e0d..8b4bc2ac8 100755
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -30,7 +30,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=67
+NUM_TESTS=72
 
 source $TESTDIR/utils/utils.sh
 
@@ -142,15 +142,33 @@ 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}