X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_load;h=b1ec57cf95e4aecf6e57172e9934edf49a08508c;hp=2e51b2e0d2261133f5c34462baff945b44bae899;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=a04d714777b901a50daa68bdda8d8b04914d3846

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 2e51b2e0d..b1ec57cf9 100755
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -1,28 +1,14 @@
 #!/bin/bash
 #
-# Copyright (C) - 2014 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2014 David Goulet <dgoulet@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
 
 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 +16,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=67
+NUM_TESTS=72
 
 source $TESTDIR/utils/utils.sh
 
@@ -97,6 +83,7 @@ function test_complex_load()
 
 	destroy_lttng_session_ok $sess
 
+	rm $mi_output_file
 	stop_lttng_relayd
 	rm -rf ${mi_output_file}
 }
@@ -142,18 +129,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 "VPID target is present"
+	else
+	    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 "Pid target is present"
+	    ok 0 "VUID target is present"
 	else
-	    fail "Pid target missing"
+	    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()