X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_save_load_mi;h=6a1f42101b23aa333e23ebd2cf49b48692ee00ea;hb=82d52a522eccf1f0fb49da4fb3436b55449aa38e;hp=cb205084111569eaa81de1650ed3af18a01a47a0;hpb=d11e3c3eeec8ba7db67f3b96c09fca4b7cabc9ad;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/test_save_load_mi b/tests/regression/tools/rotation/test_save_load_mi
index cb2050841..6a1f42101 100755
--- a/tests/regression/tools/rotation/test_save_load_mi
+++ b/tests/regression/tools/rotation/test_save_load_mi
@@ -18,11 +18,6 @@ source $CURDIR/rotate_utils.sh
 # Overwrite the lttng_bin to get mi output
 LTTNG_BIN="lttng --mi xml"
 
-XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
-
-XML_VALIDATE="$TESTDIR/utils/xml-utils/validate_xml $XSD_PATH"
-XML_EXTRACT="$TESTDIR/utils/xml-utils/extract_xml"
-
 XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
 XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
 XPATH_ENABLE_ROTATE_TIMER="$XPATH_CMD_OUTPUT/lttng:rotation_schedule_results/lttng:rotation_schedule_result/lttng:rotation_schedule/lttng:periodic/lttng:time_us"
@@ -45,7 +40,7 @@ function test_save_load_mi ()
 
 	OUTPUT_DEST=${tmp_xml_output}
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
-	$XML_VALIDATE ${tmp_xml_output}
+	$MI_VALIDATE ${tmp_xml_output}
 	ok $? "Valid lttng enable-rotation timer XML"
 
 	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_ENABLE_ROTATE_TIMER})
@@ -54,7 +49,7 @@ function test_save_load_mi ()
 
 	# Enable a rotation size and check the MI output of the command
 	lttng_enable_rotation_size_ok $SESSION_NAME 500k
-	$XML_VALIDATE ${tmp_xml_output}
+	$MI_VALIDATE ${tmp_xml_output}
 	ok $? "Valid lttng enable-rotation size XML"
 
 	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_ENABLE_ROTATE_SIZE})
@@ -62,8 +57,8 @@ function test_save_load_mi ()
 	ok $? "Found the right rotation size value in XML"
 
 	# Check the output of lttng list with the 2 rotation parameters
-	list_lttng_with_opts $SESSION_NAME
-	$XML_VALIDATE ${tmp_xml_output}
+	list_lttng_ok $SESSION_NAME
+	$MI_VALIDATE ${tmp_xml_output}
 	ok $? "Valid lttng list XML"
 
 	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_LIST_ROTATE_TIMER})
@@ -82,8 +77,8 @@ function test_save_load_mi ()
 
 	OUTPUT_DEST=${tmp_xml_output}
 	# Check the output of lttng list with the 2 rotation parameters after the load
-	list_lttng_with_opts $SESSION_NAME
-	$XML_VALIDATE ${tmp_xml_output}
+	list_lttng_ok $SESSION_NAME
+	$MI_VALIDATE ${tmp_xml_output}
 	ok $? "Valid lttng list XML after load"
 
 	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_LIST_ROTATE_TIMER})