From be424667772b2ac0ca7012316c158bae1c9834f9 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 23 Apr 2019 17:57:44 -0400 Subject: [PATCH] Fix: `tests/ctf-traces/succeed` traces: change CTF version from 0.1 to to 1.8 This version of CTF, 0.1, never really existed. Also, the first lines of the `metadata` files changed by this patch already contain `CTF 1.8`, indicating that this is a bug in the `trace` block. Somehow Babeltrace 1 is less strict than Babeltrace 2 and accepts those traces. We take the deliberate decision to refuse them. Signed-off-by: Philippe Proulx --- tests/ctf-traces/succeed/env-warning/metadata | 4 ++-- tests/ctf-traces/succeed/smalltrace/metadata | 4 ++-- tests/ctf-traces/succeed/succeed1/metadata | 4 ++-- tests/ctf-traces/succeed/succeed2/metadata | 4 ++-- tests/ctf-traces/succeed/succeed3/metadata | 4 ++-- tests/ctf-traces/succeed/succeed4/metadata | 4 ++-- tests/ctf-traces/succeed/warnings/metadata | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/ctf-traces/succeed/env-warning/metadata b/tests/ctf-traces/succeed/env-warning/metadata index f3618e292..0fb823cb4 100644 --- a/tests/ctf-traces/succeed/env-warning/metadata +++ b/tests/ctf-traces/succeed/env-warning/metadata @@ -3,8 +3,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; trace { - major = 0; - minor = 1; + major = 1; + minor = 8; uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564"; byte_order = le; packet.header := struct { diff --git a/tests/ctf-traces/succeed/smalltrace/metadata b/tests/ctf-traces/succeed/smalltrace/metadata index 86f8e0a3e..bf356a851 100644 --- a/tests/ctf-traces/succeed/smalltrace/metadata +++ b/tests/ctf-traces/succeed/smalltrace/metadata @@ -3,8 +3,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; trace { - major = 0; - minor = 1; + major = 1; + minor = 8; uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564"; byte_order = le; packet.header := struct { diff --git a/tests/ctf-traces/succeed/succeed1/metadata b/tests/ctf-traces/succeed/succeed1/metadata index f88ffb04f..2c18b9d01 100644 --- a/tests/ctf-traces/succeed/succeed1/metadata +++ b/tests/ctf-traces/succeed/succeed1/metadata @@ -3,8 +3,8 @@ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; trace { - major = 0; - minor = 1; + major = 1; + minor = 8; uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564"; byte_order = le; packet.header := struct { diff --git a/tests/ctf-traces/succeed/succeed2/metadata b/tests/ctf-traces/succeed/succeed2/metadata index 10a288f5b..c52443fcd 100644 --- a/tests/ctf-traces/succeed/succeed2/metadata +++ b/tests/ctf-traces/succeed/succeed2/metadata @@ -3,8 +3,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; trace { - major = 0; - minor = 1; + major = 1; + minor = 8; uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564"; byte_order = le; packet.header := struct { diff --git a/tests/ctf-traces/succeed/succeed3/metadata b/tests/ctf-traces/succeed/succeed3/metadata index de92b0619..5bcd1c8e6 100644 --- a/tests/ctf-traces/succeed/succeed3/metadata +++ b/tests/ctf-traces/succeed/succeed3/metadata @@ -3,8 +3,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; trace { - major = 0; - minor = 1; + major = 1; + minor = 8; test = "\""; test2 = "?\x20\040?"; test3 = '\n'; diff --git a/tests/ctf-traces/succeed/succeed4/metadata b/tests/ctf-traces/succeed/succeed4/metadata index a3d401abf..63979e97f 100644 --- a/tests/ctf-traces/succeed/succeed4/metadata +++ b/tests/ctf-traces/succeed/succeed4/metadata @@ -3,8 +3,8 @@ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; trace { - major = 0; - minor = 1; + major = 1; + minor = 8; test = 0xABC234; /* hexadecimal */ test1 = 06534; /* octal */ test2 = 1234; /* decimal */ diff --git a/tests/ctf-traces/succeed/warnings/metadata b/tests/ctf-traces/succeed/warnings/metadata index 30ca7841c..125a5d584 100644 --- a/tests/ctf-traces/succeed/warnings/metadata +++ b/tests/ctf-traces/succeed/warnings/metadata @@ -3,8 +3,8 @@ typealias integer { size = 8; align = 8; signed = false; aa = bb; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; zz = aa; } := uint32_t; trace { - major = 0; - minor = 1; + major = 1; + minor = 8; uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564"; byte_order = le; packet.header := struct { -- 2.34.1