X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_load;h=6b892cfdc4e05bb02b2ced8fdd241d76842fc3f3;hb=96340a015194538227efcbc654ec02c2ed9961ce;hp=a58c29967cc60aa1d22218b8f4076b75f586c475;hpb=e02b109ba0132f2c715fdb9db55cbdf8f8203749;p=lttng-tools.git

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index a58c29967..6b892cfdc 100755
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -22,13 +22,14 @@ 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"
 EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=20
+NUM_TESTS=21
 
 source $TESTDIR/utils/utils.sh
 
@@ -51,7 +52,7 @@ function test_basic_load()
 {
 	diag "Test basic load"
 
-	lttng_load "-s $SESSION_NAME -i $CURDIR"
+	lttng_load "-i $CURDIR/$SESSION_NAME.lttng"
 
 	destroy_lttng_session $SESSION_NAME
 }
@@ -65,7 +66,7 @@ function test_complex_load()
 	# custom values.
 	start_lttng_relayd "-C tcp://localhost:8172 -D tcp://localhost:9817"
 
-	lttng_load "-s $sess -i $CURDIR"
+	lttng_load "-i $CURDIR/$sess.lttng"
 
 	# Once loaded, we are suppose to be able to disable certain events/channels
 	# thus having a confirmation that it's valid
@@ -77,6 +78,18 @@ function test_complex_load()
 	disable_ust_lttng_channel $sess chan2
 	disable_ust_lttng_channel $sess chan3
 
+	# Confirm that an event stored as disabled is restored in its disabled state
+	local mi_output_file=$(mktemp)
+	if [ $? -ne 0 ]; then
+		break;
+	fi
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi XML list $sess -c chan2 > $mi_output_file
+	mi_result=$($CURDIR/../mi/extract_xml $mi_output_file "//command/output/sessions/session/domains/domain/channels/channel[name='chan2']/events/event[name='uevent_disabled']/enabled/text()")
+	if [[ $mi_result = "false" ]]; then
+	    ok 0 "Disabled event is loaded in disabled state"
+	else
+	    fail "Disabled event is loaded in disabled state"
+	fi
 	destroy_lttng_session $sess
 
 	stop_lttng_relayd_nocheck
@@ -102,10 +115,10 @@ function test_overwrite()
 {
 	diag "Test load overwrite"
 
-	lttng_load "-s $SESSION_NAME -i $CURDIR"
+	lttng_load "-i $CURDIR/$SESSION_NAME.lttng"
 
 	# This one should succeed
-	lttng_load "-f -s $SESSION_NAME -i $CURDIR"
+	lttng_load "-f -i $CURDIR $SESSION_NAME"
 
 	destroy_lttng_session $SESSION_NAME
 }