From b7beee1d5411e01d477c089756592605c1202be8 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 3 Aug 2011 13:11:57 -0400 Subject: [PATCH] update test files header to "CTF 1.8" Signed-off-by: Mathieu Desnoyers --- .../ctf-test/development/ctf-embedded-1.txt | 2 +- .../metadata/ctf-test/fail/array-negative-len.txt | 2 +- .../ctf-test/fail/array-unexisting-elem-type.txt | 2 +- .../ctf-test/fail/enum-with-non-numeric-range.txt | 2 +- .../ctf-test/fail/event-with-non-text-left.txt | 2 +- .../ctf-test/fail/sequence-incorrect-elem-type.txt | 2 +- .../fail/sequence-incorrect-len-type-signedness.txt | 2 +- .../ctf-test/fail/sequence-incorrect-len-type.txt | 2 +- .../ctf-test/fail/stream-with-non-text-left.txt | 2 +- .../ctf-test/fail/struct-unexisting-field-type.txt | 2 +- .../fail/struct-with-duplicate-field-name.txt | 2 +- .../ctf-test/fail/struct-with-non-text-left-2.txt | 2 +- .../ctf-test/fail/struct-with-non-text-left-3.txt | 2 +- .../ctf-test/fail/struct-with-non-text-left-4.txt | 2 +- .../ctf-test/fail/struct-with-non-text-left-5.txt | 2 +- .../ctf-test/fail/struct-with-non-text-left.txt | 2 +- .../ctf-test/fail/struct-with-right-range.txt | 2 +- .../ctf-test/fail/trace-with-non-text-left.txt | 2 +- .../ctf-test/fail/typealias-left-abstract-array.txt | 2 +- .../ctf-test/fail/typealias-no-array-alias.txt | 2 +- .../ctf-test/fail/typedef-untagged-variant.txt | 2 +- .../ctf-test/fail/variant-unexisting-field-type.txt | 2 +- .../fail/variant-with-duplicate-field-name.txt | 2 +- .../ctf-test/fail/variant-with-non-text-left.txt | 2 +- .../metadata/ctf-test/succeed/ctf-embedded-1.txt | 2 +- .../metadata/ctf-test/succeed/ctf-embedded-2.txt | 2 +- .../ctf-single-stream-with-packet-context.txt | 2 +- .../metadata/ctf-test/succeed/ctf-single-stream.txt | 2 +- .../ctf-test/succeed/ctf-test-align-attribute.txt | 2 +- .../ctf/metadata/ctf-test/succeed/ctf-test-seq.txt | 2 +- formats/ctf/metadata/ctf-test/succeed/ctf-test.txt | 2 +- formats/ctf/metadata/ctf-test/tofix/ctf-path.txt | 2 +- .../metadata/ctf-test/tofix/ctf-redefine-type.txt | 2 +- .../ctf-test/tofix/ctf-typedef-ambiguity.txt | 2 +- include/babeltrace/ctf/metadata.h | 2 ++ tests/ctf-traces/fail/fail1/metadata | 2 +- .../lttng-modules-2.0-pre1/channel0_0 | Bin .../lttng-modules-2.0-pre1/channel0_1 | Bin .../lttng-modules-2.0-pre1/channel0_2 | Bin .../lttng-modules-2.0-pre1/channel0_3 | Bin .../lttng-modules-2.0-pre1/channel0_4 | Bin .../lttng-modules-2.0-pre1/channel0_5 | Bin .../lttng-modules-2.0-pre1/channel0_6 | Bin .../lttng-modules-2.0-pre1/channel0_7 | Bin .../lttng-modules-2.0-pre1/metadata | Bin .../packet-based-metadata/datastream | Bin .../packet-based-metadata/metadata | Bin tests/ctf-traces/succeed/succeed1/metadata | 2 +- tests/ctf-traces/succeed/succeed2/metadata | 2 +- 49 files changed, 39 insertions(+), 37 deletions(-) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/channel0_0 (100%) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/channel0_1 (100%) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/channel0_2 (100%) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/channel0_3 (100%) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/channel0_4 (100%) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/channel0_5 (100%) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/channel0_6 (100%) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/channel0_7 (100%) rename tests/ctf-traces/{succeed => fail}/lttng-modules-2.0-pre1/metadata (100%) rename tests/ctf-traces/{succeed => fail}/packet-based-metadata/datastream (100%) rename tests/ctf-traces/{succeed => fail}/packet-based-metadata/metadata (100%) diff --git a/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt b/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt index bf57de67..e814835f 100644 --- a/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt +++ b/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ trace { major = 0; minor = 1; diff --git a/formats/ctf/metadata/ctf-test/fail/array-negative-len.txt b/formats/ctf/metadata/ctf-test/fail/array-negative-len.txt index 484b3b71..3431b4c9 100644 --- a/formats/ctf/metadata/ctf-test/fail/array-negative-len.txt +++ b/formats/ctf/metadata/ctf-test/fail/array-negative-len.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 32; align = 32; signed = false; } := uint; typedef uint myarray[-10]; diff --git a/formats/ctf/metadata/ctf-test/fail/array-unexisting-elem-type.txt b/formats/ctf/metadata/ctf-test/fail/array-unexisting-elem-type.txt index 3506a76f..5310438f 100644 --- a/formats/ctf/metadata/ctf-test/fail/array-unexisting-elem-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/array-unexisting-elem-type.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ typedef nonexist myarray[10]; diff --git a/formats/ctf/metadata/ctf-test/fail/enum-with-non-numeric-range.txt b/formats/ctf/metadata/ctf-test/fail/enum-with-non-numeric-range.txt index e96090e8..1e1d9089 100644 --- a/formats/ctf/metadata/ctf-test/fail/enum-with-non-numeric-range.txt +++ b/formats/ctf/metadata/ctf-test/fail/enum-with-non-numeric-range.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ enum test {X = array[2].N ... 1, }; diff --git a/formats/ctf/metadata/ctf-test/fail/event-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/event-with-non-text-left.txt index a4b340d8..e30b0037 100644 --- a/formats/ctf/metadata/ctf-test/fail/event-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/event-with-non-text-left.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ event { 42 = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-elem-type.txt b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-elem-type.txt index 66b8a72e..78651f28 100644 --- a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-elem-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-elem-type.txt @@ -1,3 +1,3 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 32; align = 32; signed = false; } := uint; typedef nonexist testseq[uint]; diff --git a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type-signedness.txt b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type-signedness.txt index 98adf5af..ec962960 100644 --- a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type-signedness.txt +++ b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type-signedness.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 32; align = 32; signed = false; } := uint; typealias integer { size = 32; align = 32; signed = true; } := int; typedef uint testseq[int]; diff --git a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type.txt b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type.txt index 6e0f17e8..67de76a0 100644 --- a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ struct name {}; typealias integer { size = 32; align = 32; signed = false; } := uint; typedef uint testseq[struct name]; diff --git a/formats/ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt index 510ec62f..8d090b9d 100644 --- a/formats/ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ stream { 42 = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-unexisting-field-type.txt b/formats/ctf/metadata/ctf-test/fail/struct-unexisting-field-type.txt index d8ebdd10..da9df8ab 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-unexisting-field-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-unexisting-field-type.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ struct test { int a; int b; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-duplicate-field-name.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-duplicate-field-name.txt index 2f9c87f4..c0798216 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-duplicate-field-name.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-duplicate-field-name.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 32; align = 32; signed = true; } := int; struct { diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-2.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-2.txt index 8c45fd31..f14a94a9 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-2.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-2.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ struct test { int a.array[3].N; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-3.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-3.txt index 9634616f..15fafbc6 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-3.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-3.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ struct test { a->array[3].N test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-4.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-4.txt index bead2ba2..c78232f3 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-4.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-4.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ struct test { array[1] blah; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-5.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-5.txt index d986e7d6..5ce45c29 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-5.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-5.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ struct test { 42 = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt index c0189c04..eb1d8a48 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ struct test { array[3].N = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-right-range.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-right-range.txt index 77cd4f0f..aa412ac2 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-right-range.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-right-range.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ struct test { test = 444 ... 555; }; diff --git a/formats/ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt index af7cd487..93cabfa7 100644 --- a/formats/ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ trace { 42 = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/typealias-left-abstract-array.txt b/formats/ctf/metadata/ctf-test/fail/typealias-left-abstract-array.txt index 678133fb..3f5efcba 100644 --- a/formats/ctf/metadata/ctf-test/fail/typealias-left-abstract-array.txt +++ b/formats/ctf/metadata/ctf-test/fail/typealias-left-abstract-array.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias uint8_t [] := puint8_t; diff --git a/formats/ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt b/formats/ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt index 1cb4892c..0a087289 100644 --- a/formats/ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt +++ b/formats/ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 32; align = 32; signed = false; } : unsigned const long []; diff --git a/formats/ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt b/formats/ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt index c13d9793..289be14a 100644 --- a/formats/ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt +++ b/formats/ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 32; align = 32; signed = true; } := int; typedef variant { diff --git a/formats/ctf/metadata/ctf-test/fail/variant-unexisting-field-type.txt b/formats/ctf/metadata/ctf-test/fail/variant-unexisting-field-type.txt index 568c6fd6..59f51701 100644 --- a/formats/ctf/metadata/ctf-test/fail/variant-unexisting-field-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/variant-unexisting-field-type.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ variant test { int a; int b; diff --git a/formats/ctf/metadata/ctf-test/fail/variant-with-duplicate-field-name.txt b/formats/ctf/metadata/ctf-test/fail/variant-with-duplicate-field-name.txt index 3959b487..e684dda5 100644 --- a/formats/ctf/metadata/ctf-test/fail/variant-with-duplicate-field-name.txt +++ b/formats/ctf/metadata/ctf-test/fail/variant-with-duplicate-field-name.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 32; align = 32; signed = true; } := int; variant { diff --git a/formats/ctf/metadata/ctf-test/fail/variant-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/variant-with-non-text-left.txt index 0b7169bf..cf467dbb 100644 --- a/formats/ctf/metadata/ctf-test/fail/variant-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/variant-with-non-text-left.txt @@ -1,2 +1,2 @@ -/* TSDL */ +/* CTF 1.8 */ variant test { 555 = test }; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt index aae081e9..cb173442 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ trace { major = 0; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt index 166ff0b4..7be3ef4f 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ /* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream-with-packet-context.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream-with-packet-context.txt index 1e807bfb..d18b4ccc 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream-with-packet-context.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream-with-packet-context.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt index 3140ea87..f1ebfc87 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test-align-attribute.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test-align-attribute.txt index 1db58cc4..3f236cac 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test-align-attribute.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test-align-attribute.txt @@ -1,4 +1,4 @@ -/* TSDL +/* CTF 1.8 * * Architecture with 32-bit pointers, 32-bit integers, 32-bit longs. */ diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt index a5298efb..82a30caf 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt @@ -1,4 +1,4 @@ -/* TSDL +/* CTF 1.8 * * Architecture with 32-bit pointers, 32-bit integers, 32-bit longs. */ diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt index b6ff20a2..b6b1ab9d 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 32; align = 32; signed = true; } := int; typealias integer { size = 32; align = 32; signed = false; } := uint; diff --git a/formats/ctf/metadata/ctf-test/tofix/ctf-path.txt b/formats/ctf/metadata/ctf-test/tofix/ctf-path.txt index 86a78743..3d8a2c77 100644 --- a/formats/ctf/metadata/ctf-test/tofix/ctf-path.txt +++ b/formats/ctf/metadata/ctf-test/tofix/ctf-path.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 8; align = 8; signed = false; base = hex; } := uint8_t; typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t; diff --git a/formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt b/formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt index 20e03b53..eca6723b 100644 --- a/formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt +++ b/formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 8; signed = false; } := uint32_t; diff --git a/formats/ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt b/formats/ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt index 445e4e97..94bc39ef 100644 --- a/formats/ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt +++ b/formats/ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ // Define unsigned long typealias integer { ... } := unsigned long; diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h index e985ee5f..f283fe70 100644 --- a/include/babeltrace/ctf/metadata.h +++ b/include/babeltrace/ctf/metadata.h @@ -49,6 +49,8 @@ struct metadata_packet_header { uint8_t compression_scheme; /* 0 if unused */ uint8_t encryption_scheme; /* 0 if unused */ uint8_t checksum_scheme; /* 0 if unused */ + uint8_t major; /* CTF spec major version number */ + uint8_t minor; /* CTF spec minor version number */ HEADER_END; }; diff --git a/tests/ctf-traces/fail/fail1/metadata b/tests/ctf-traces/fail/fail1/metadata index 88e20d88..28185f5d 100644 --- a/tests/ctf-traces/fail/fail1/metadata +++ b/tests/ctf-traces/fail/fail1/metadata @@ -1,4 +1,4 @@ -/* TSDL +/* CTF 1.8 * * Architecture with 32-bit pointers, 32-bit integers, 32-bit longs. */ diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_0 b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_0 similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_0 rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_0 diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_1 b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_1 similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_1 rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_1 diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_2 b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_2 similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_2 rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_2 diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_3 b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_3 similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_3 rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_3 diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_4 b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_4 similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_4 rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_4 diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_5 b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_5 similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_5 rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_5 diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_6 b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_6 similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_6 rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_6 diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_7 b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_7 similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/channel0_7 rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/channel0_7 diff --git a/tests/ctf-traces/succeed/lttng-modules-2.0-pre1/metadata b/tests/ctf-traces/fail/lttng-modules-2.0-pre1/metadata similarity index 100% rename from tests/ctf-traces/succeed/lttng-modules-2.0-pre1/metadata rename to tests/ctf-traces/fail/lttng-modules-2.0-pre1/metadata diff --git a/tests/ctf-traces/succeed/packet-based-metadata/datastream b/tests/ctf-traces/fail/packet-based-metadata/datastream similarity index 100% rename from tests/ctf-traces/succeed/packet-based-metadata/datastream rename to tests/ctf-traces/fail/packet-based-metadata/datastream diff --git a/tests/ctf-traces/succeed/packet-based-metadata/metadata b/tests/ctf-traces/fail/packet-based-metadata/metadata similarity index 100% rename from tests/ctf-traces/succeed/packet-based-metadata/metadata rename to tests/ctf-traces/fail/packet-based-metadata/metadata diff --git a/tests/ctf-traces/succeed/succeed1/metadata b/tests/ctf-traces/succeed/succeed1/metadata index af1326ca..f88ffb04 100644 --- a/tests/ctf-traces/succeed/succeed1/metadata +++ b/tests/ctf-traces/succeed/succeed1/metadata @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; diff --git a/tests/ctf-traces/succeed/succeed2/metadata b/tests/ctf-traces/succeed/succeed2/metadata index 175e4f77..10a288f5 100644 --- a/tests/ctf-traces/succeed/succeed2/metadata +++ b/tests/ctf-traces/succeed/succeed2/metadata @@ -1,4 +1,4 @@ -/* TSDL */ +/* CTF 1.8 */ typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; base = hex; } := uint32_t; -- 2.34.1