X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_load;h=1870bf0b4292cb3cdbc6d1744e1294fc9342088d;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hp=b1ec57cf95e4aecf6e57172e9934edf49a08508c;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index b1ec57cf9..1870bf0b4 100755
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -16,7 +16,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=72
+NUM_TESTS=78
 
 source $TESTDIR/utils/utils.sh
 
@@ -101,6 +101,10 @@ function test_all_load()
 	destroy_lttng_session_ok $SESSION_NAME
 	destroy_lttng_session_ok "$SESSION_NAME-complex"
 	destroy_lttng_session_ok "$SESSION_NAME-trackers"
+	destroy_lttng_session_ok "$SESSION_NAME-maps"
+	destroy_lttng_session_ok "tracker_legacy_all"
+	destroy_lttng_session_ok "tracker_legacy_none"
+	destroy_lttng_session_ok "tracker_legacy_selective"
 
 	stop_lttng_relayd
 }
@@ -129,21 +133,21 @@ 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:vpid_tracker/lttng:targets/lttng:vpid_target")
+	mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vpid_process_attr_tracker/lttng:process_attr_values/lttng:vpid")
 	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")
+	mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vuid_process_attr_tracker/lttng:process_attr_values/lttng:vuid")
 	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")
+	mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vgid_process_attr_tracker/lttng:process_attr_values/lttng:vgid")
 	if [[ $mi_result = "true" ]]; then
 	    ok 0 "VGID target is present"
 	else
@@ -161,6 +165,25 @@ function test_trackers()
 	rm -f ${mi_output_file}
 }
 
+function test_maps()
+{
+	diag "Test maps loading"
+
+	lttng_load_ok "-i $CURDIR/$SESSION_NAME-maps.lttng"
+
+	local mi_output_file=$(mktemp)
+	if [ $? -ne 0 ]; then
+		break;
+	fi
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi XML list "$SESSION_NAME-maps" > $mi_output_file
+
+	# TODO: once map information is in the MI, do some mad testing with sick xpath expressions.
+
+	destroy_lttng_session_ok "$SESSION_NAME-maps"
+	rm -f ${mi_output_file}
+}
+
 function test_override_url_normal()
 {
 	local local_url_override="file:///tmp/override/to/here"
@@ -351,6 +374,7 @@ TESTS=(
 	test_all_load
 	test_overwrite
 	test_trackers
+	test_maps
 	test_override_session_name
 	test_override_url_normal
 	test_override_url_snapshot