X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf%2Fmetadata%2Fctf-test%2Fsucceed%2Fctf-test.txt;h=b6ff20a25371a02dc44265ff93522fe16677134d;hb=5eda3dc244a6ad68c74a3bd22fac233182aad0fb;hp=34dd8274f863a321637935765be44fa37a1c5444;hpb=6743829ac9d7ae22c8bcc28b6ad162dd3d0b2104;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt
index 34dd8274..b6ff20a2 100644
--- a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt
+++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt
@@ -1,5 +1,7 @@
+/* TSDL */
 
 typealias integer { size = 32; align = 32; signed = true; } := int;
+typealias integer { size = 32; align = 32; signed = false; } := uint;
 typealias integer { size = 64; align = 64; signed = true; } := long;
 typealias integer { size = 64; align = 64; } := unsigned long;
 
@@ -38,11 +40,21 @@ typealias integer {
   signed = false;
 } := struct page *;
 
+struct event_packet_header {
+  typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
+  typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
+
+  uint32_t magic;
+  uint8_t  uuid[16];
+  uint32_t stream_id;
+};
+
 trace {
 	major = 66;
 	minor = 2;
+	byte_order = le;
 	uuid = "1123fcea-706e-11e0-a38b-f3c28a683a3d";
-	word_size = 64;
+	packet.header := struct event_packet_header;
 };
 
 stream {
@@ -93,15 +105,6 @@ typealias integer {
 
 typealias string { encoding = UTF8; } := test;
 
-struct event_packet_header {
-  typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
-  typealias integer { size = 8; align = 8; signed = false; } := uint8_t;
-
-  uint32_t magic;
-  uint8_t  trace_uuid[16];
-  uint32_t stream_id;
-};
-
 struct event_packet_context {
   typealias integer { size = 64; align = 64; signed = false; } := uint64_t;
   typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
@@ -174,7 +177,29 @@ event {
 	id = 0;
 	stream_id = 5;
 	context := struct {};
-	payload := struct {};
+	fields := struct {};
 };
 
 typealias integer { size = 32; align = 32; signed = false; } := unsigned long long *;
+
+variant vardecl {
+	int a;
+	int b;
+};
+
+event {
+	typealias integer { size = 8; align = 8; signed = true; } := char;
+	typealias integer { size = 32; align = 32; signed = false; } := unsigned int;
+
+	name = test_event2;
+	id = 1;
+	stream_id = 5;
+	fields := struct {
+		enum : char { a = 0, b = 1, } tag;
+		variant vardecl <tag> myvariant;
+		unsigned int seqlen;
+		int myseq[seqlen];
+	};
+};
+
+typedef int myarray[10];