From 01fac81494c061d122404aa1dbafc8d7bc93fb3d Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 5 Jul 2018 11:08:40 -0400
Subject: [PATCH] trackers: bump MI version to 4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I0a44262016cf90e0629be5cb7d8b5976462c62d9
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/common/Makefile.am                            | 2 +-
 src/common/{mi-lttng-3.0.xsd => mi-lttng-4.0.xsd} | 2 +-
 tests/regression/tools/mi/test_mi                 | 2 +-
 tests/regression/tools/relayd-grouping/test_ust   | 2 +-
 tests/regression/tools/rotation/test_save_load_mi | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/common/{mi-lttng-3.0.xsd => mi-lttng-4.0.xsd} (99%)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a40ec0d29..95935b76e 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -22,7 +22,7 @@ DIST_SUBDIRS = \
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la
-EXTRA_DIST = mi-lttng-3.0.xsd
+EXTRA_DIST = mi-lttng-4.0.xsd
 
 libcommon_la_SOURCES = \
 	action.c \
diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-4.0.xsd
similarity index 99%
rename from src/common/mi-lttng-3.0.xsd
rename to src/common/mi-lttng-4.0.xsd
index 218d5bd98..a6a7af699 100644
--- a/src/common/mi-lttng-3.0.xsd
+++ b/src/common/mi-lttng-4.0.xsd
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	targetNamespace="https://lttng.org/xml/ns/lttng-mi"
 	xmlns:tns="https://lttng.org/xml/ns/lttng-mi"
-	elementFormDefault="qualified" version="3.0">
+	elementFormDefault="qualified" version="4.0">
 
 	<!-- Maps to the uint32_t type -->
 	<xs:simpleType name="uint32_type">
diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index 8eb049122..3feff4ac5 100755
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -19,7 +19,7 @@ TEST_DESC="Machine interface testing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
+XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
 
 #Test app for ust event
 TESTAPP_PATH="$TESTDIR/utils/testapp"
diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust
index 85d7197e6..5749f5a47 100755
--- a/tests/regression/tools/relayd-grouping/test_ust
+++ b/tests/regression/tools/relayd-grouping/test_ust
@@ -27,7 +27,7 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 EVENT_NAME="tp:tptest"
 CHANNEL_NAME="my_channel"
 
-XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
+XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
 
 XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH"
 XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml"
diff --git a/tests/regression/tools/rotation/test_save_load_mi b/tests/regression/tools/rotation/test_save_load_mi
index 494d375f6..80500b40f 100755
--- a/tests/regression/tools/rotation/test_save_load_mi
+++ b/tests/regression/tools/rotation/test_save_load_mi
@@ -29,7 +29,7 @@ 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-3.0.xsd
+XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
 
 XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH"
 XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml"
-- 
2.34.1