X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-test%2Fsucceed%2Fctf-test.txt;h=b6b1ab9d02a50a71369feab8b779715fdd0c8762;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=efbd3707ae2face9ccc72c45255a6c8a372dbc52;hpb=152a577195ac7d504935bd59b41a48678d9b22d0;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 efbd3707..b6b1ab9d 100644
--- a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt
+++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt
@@ -1,3 +1,4 @@
+/* CTF 1.8 */
 
 typealias integer { size = 32; align = 32; signed = true; } := int;
 typealias integer { size = 32; align = 32; signed = false; } := uint;
@@ -39,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 {
@@ -94,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;
@@ -175,7 +177,7 @@ event {
 	id = 0;
 	stream_id = 5;
 	context := struct {};
-	payload := struct {};
+	fields := struct {};
 };
 
 typealias integer { size = 32; align = 32; signed = false; } := unsigned long long *;
@@ -186,14 +188,18 @@ variant vardecl {
 };
 
 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;
-	payload := struct {
+	fields := struct {
 		enum : char { a = 0, b = 1, } tag;
 		variant vardecl <tag> myvariant;
+		unsigned int seqlen;
+		int myseq[seqlen];
 	};
 };
 
 typedef int myarray[10];
-typedef int myseq[uint];