X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_load;h=c6234efe1fce443e6f7573079db2f7e05b954983;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hp=6cc98a0c5d61214df449f960faff2f6297a4ddf9;hpb=1114378362fe014288ccaab1d1fed52f7b5703f8;p=lttng-tools.git

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 6cc98a0c5..c6234efe1 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,9 +52,9 @@ function test_basic_load()
 {
 	diag "Test basic load"
 
-	lttng_load "$SESSION_NAME -i $CURDIR"
+	lttng_load "-i $CURDIR/$SESSION_NAME.lttng"
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_complex_load()
@@ -65,7 +66,7 @@ function test_complex_load()
 	# custom values.
 	start_lttng_relayd "-C tcp://localhost:8172 -D tcp://localhost:9817"
 
-	lttng_load "$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,7 +78,19 @@ function test_complex_load()
 	disable_ust_lttng_channel $sess chan2
 	disable_ust_lttng_channel $sess chan3
 
-	destroy_lttng_session $sess
+	# 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_ok $sess
 
 	stop_lttng_relayd_nocheck
 }
@@ -92,8 +105,8 @@ function test_all_load()
 
 	lttng_load "-a -i $CURDIR"
 
-	destroy_lttng_session $SESSION_NAME
-	destroy_lttng_session "$SESSION_NAME-complex"
+	destroy_lttng_session_ok $SESSION_NAME
+	destroy_lttng_session_ok "$SESSION_NAME-complex"
 
 	stop_lttng_relayd_nocheck
 }
@@ -102,12 +115,12 @@ function test_overwrite()
 {
 	diag "Test load overwrite"
 
-	lttng_load "$SESSION_NAME -i $CURDIR"
+	lttng_load "-i $CURDIR/$SESSION_NAME.lttng"
 
 	# This one should succeed
 	lttng_load "-f -i $CURDIR $SESSION_NAME"
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond