X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_save_load_mi;h=494d375f6fd701c5eb80c5fb8ba19fd9e67db053;hb=3b33e9e731f2091e8aa13ea035c295ed6f101eac;hp=862634db5c4c3f215227b71379ab4f53a0eadf97;hpb=308a89467c4dbfe218a9665bab82555dd88c07c9;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 862634db5..494d375f6 100755
--- a/tests/regression/tools/rotation/test_save_load_mi
+++ b/tests/regression/tools/rotation/test_save_load_mi
@@ -21,14 +21,12 @@ CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 SESSION_NAME="stream"
 
-TRACE_PATH=$(mktemp -d)
-
 NUM_TESTS=22
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
 
-#Overwrite the lttng_bin to get mi output
+# Overwrite the lttng_bin to get mi output
 LTTNG_BIN="lttng --mi xml"
 
 XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
@@ -38,15 +36,20 @@ XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml"
 
 XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
 XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
-XPATH_ROTATE_SETUP="$XPATH_CMD_OUTPUT/lttng:rotation_schedule"
+XPATH_ENABLE_ROTATE_TIMER="$XPATH_CMD_OUTPUT/lttng:rotation_schedule_results/lttng:rotation_schedule_result/lttng:rotation_schedule/lttng:periodic/lttng:time_us"
+XPATH_ENABLE_ROTATE_SIZE="$XPATH_CMD_OUTPUT/lttng:rotation_schedule_results/lttng:rotation_schedule_result/lttng:rotation_schedule/lttng:size_threshold/lttng:bytes"
+
+XPATH_LIST_ROTATE_TIMER="$XPATH_SESSION/lttng:rotation_schedules/lttng:periodic/lttng:time_us"
+XPATH_LIST_ROTATE_SIZE="$XPATH_SESSION/lttng:rotation_schedules/lttng:size_threshold/lttng:bytes"
 
 function test_save_load_mi ()
 {
 	tmp_xml_output=$(mktemp -u)
 	tmp_save_output=$(mktemp -d)
+	trace_path=$(mktemp -d)
 
 	diag "Test save/load/list/MI with rotation"
-	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $trace_path
 	enable_ust_lttng_event_ok $SESSION_NAME -a
 
 	# Enable a rotation timer and check the MI output of the command
@@ -56,7 +59,7 @@ function test_save_load_mi ()
 	$XML_VALIDATE ${tmp_xml_output}
 	ok $? "Valid lttng enable-rotation timer XML"
 
-	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_ROTATE_SETUP}/lttng:rotation_schedule_timer_period)
+	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_ENABLE_ROTATE_TIMER})
 	test $value = 500000
 	ok $? "Found the right rotation timer value in XML"
 
@@ -65,7 +68,7 @@ function test_save_load_mi ()
 	$XML_VALIDATE ${tmp_xml_output}
 	ok $? "Valid lttng enable-rotation size XML"
 
-	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_ROTATE_SETUP}/lttng:rotation_schedule_size)
+	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_ENABLE_ROTATE_SIZE})
 	test $value = 512000
 	ok $? "Found the right rotation size value in XML"
 
@@ -74,11 +77,11 @@ function test_save_load_mi ()
 	$XML_VALIDATE ${tmp_xml_output}
 	ok $? "Valid lttng list XML"
 
-	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_SESSION}/lttng:rotation_schedule_timer_period)
+	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_LIST_ROTATE_TIMER})
 	test $value = 500000
 	ok $? "Found the right rotation timer value in list XML"
 
-	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_SESSION}/lttng:rotation_schedule_size)
+	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_LIST_ROTATE_SIZE})
 	test $value = 512000
 	ok $? "Found the right rotation size value in list XML"
 
@@ -94,18 +97,18 @@ function test_save_load_mi ()
 	$XML_VALIDATE ${tmp_xml_output}
 	ok $? "Valid lttng list XML after load"
 
-	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_SESSION}/lttng:rotation_schedule_timer_period)
+	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_LIST_ROTATE_TIMER})
 	test $value = 500000
 	ok $? "Found the right rotation timer value in list XML after load"
 
-	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_SESSION}/lttng:rotation_schedule_size)
+	value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_LIST_ROTATE_SIZE})
 	test $value = 512000
 	ok $? "Found the right rotation size value in list XML after load"
 
 	OUTPUT_DEST=/dev/null
 	destroy_lttng_session_ok $SESSION_NAME
 
-	rm -rf ${TRACE_PATH}
+	rm -rf ${trace_path}
 	rm $tmp_xml_output
 	rm -rf $tmp_save_output
 }