From a1d35738baf90ead12467ddbad6dc34f31f1306a Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Fri, 9 Feb 2024 16:22:20 -0500 Subject: [PATCH] tests: move CTF 1 test traces to their own directory Signed-off-by: Francis Deslauriers Change-Id: I4d7ca33c1187b7495dd49103ecec66316ff65001 Reviewed-on: https://review.lttng.org/c/babeltrace/+/8433 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/8644 --- .../test_trace_collection_message_iterator.py | 8 ++--- tests/cli/convert/test-convert-args.sh | 4 +-- tests/cli/test-intersection.sh | 10 +++--- tests/cli/test-output-ctf-metadata.sh | 2 +- .../test-output-path-ctf-non-lttng-trace.sh | 6 ++-- tests/cli/test-packet-seq-num.sh | 10 +++--- tests/cli/test-trace-copy.sh | 2 +- tests/cli/test-trace-read.sh | 4 +-- tests/cli/test-trimmer.sh | 2 +- .../a-corrupted/dummystream | Bin .../a-corrupted/metadata | 0 .../{ => 1}/deterministic-ordering/b-c.expect | 0 .../b-not-corrupted/dummystream | Bin .../b-not-corrupted/metadata | 0 .../c-corrupted/dummystream | Bin .../c-corrupted/metadata | 0 .../ctf-traces/{ => 1}/fail/fail1/dummystream | Bin .../ctf-traces/{ => 1}/fail/fail1/metadata | 0 .../ctf-traces/{ => 1}/fail/fail2/metadata | Bin .../{ => 1}/fail/integer-range/metadata | 0 .../{ => 1}/fail/invalid-packet-size/README | 0 .../fail/invalid-packet-size/trace/channel0_3 | Bin .../trace/index/channel0_3.idx | Bin .../fail/invalid-packet-size/trace/metadata | Bin .../metadata | 0 .../metadata | 0 .../fail/lttng-modules-2.0-pre1/metadata | Bin .../fail/metadata-syntax-error/metadata | 0 .../fail/packet-based-metadata/metadata | Bin .../{ => 1}/fail/smalltrace/dummystream-fail | 0 .../{ => 1}/fail/smalltrace/metadata | 0 .../valid-events-then-invalid-events/README | 0 .../trace/dummystream | 0 .../trace/metadata | 0 .../intersection/3eventsintersect/metadata | 0 .../3eventsintersect/test_stream_0 | Bin .../3eventsintersect/test_stream_1 | Bin .../3eventsintersectreverse/metadata | 0 .../3eventsintersectreverse/test_stream_0 | Bin .../3eventsintersectreverse/test_stream_1 | Bin .../{ => 1}/intersection/nointersect/metadata | 0 .../intersection/nointersect/test_stream_0 | Bin .../intersection/nointersect/test_stream_1 | Bin .../{ => 1}/intersection/nostream/metadata | 0 .../{ => 1}/intersection/onestream/metadata | 0 .../intersection/onestream/test_stream_0 | Bin .../{ => 1}/live/new-streams/first-trace.mctf | 0 .../live/new-streams/second-trace.mctf | 0 .../{ => 1}/live/split-metadata/channel0_0 | Bin .../live/split-metadata/index/channel0_0.idx | Bin .../{ => 1}/live/split-metadata/metadata | 0 .../{ => 1}/live/stored-values.mctf | 0 .../2-lost-before-last/metadata | 0 .../2-lost-before-last/test_stream_0 | Bin .../2-streams-lost-in-1/metadata | 0 .../2-streams-lost-in-1/test_stream_0 | Bin .../2-streams-lost-in-1/test_stream_1 | Bin .../2-streams-lost-in-2/metadata | 0 .../2-streams-lost-in-2/test_stream_0 | Bin .../2-streams-lost-in-2/test_stream_1 | Bin .../index/stream_0.idx | Bin .../7-lost-between-2-with-index/metadata | 0 .../7-lost-between-2-with-index/stream_0 | Bin .../no-lost-not-starting-at-0/metadata | 0 .../no-lost-not-starting-at-0/test_stream_0 | Bin .../{ => 1}/packet-seq-num/no-lost/metadata | 0 .../packet-seq-num/no-lost/test_stream_0 | Bin .../{ => 1}/succeed/2packets/channel0_2 | Bin .../succeed/2packets/index/channel0_2.idx | Bin .../{ => 1}/succeed/2packets/metadata | Bin .../{ => 1}/succeed/array-align-elem/metadata | 0 .../{ => 1}/succeed/array-align-elem/stream | 0 .../barectf-event-before-packet/metadata | 0 .../barectf-event-before-packet/stream | Bin .../{ => 1}/succeed/crlf-metadata/channel0_0 | Bin .../{ => 1}/succeed/crlf-metadata/metadata | 0 .../{ => 1}/succeed/debug-info/channel0_0 | Bin .../{ => 1}/succeed/debug-info/metadata | 0 .../{ => 1}/succeed/env-warning/dummystream | Bin .../{ => 1}/succeed/env-warning/metadata | 0 .../succeed/ev-disc-no-ts-begin-end/metadata | 0 .../succeed/ev-disc-no-ts-begin-end/stream | Bin .../{ => 1}/succeed/lf-metadata/channel0_0 | Bin .../{ => 1}/succeed/lf-metadata/metadata | 0 .../{ => 1}/succeed/lttng-crash/chan_0 | Bin .../{ => 1}/succeed/lttng-crash/metadata | 0 .../succeed/lttng-event-after-packet/chan_0 | Bin .../succeed/lttng-event-after-packet/metadata | 0 .../succeed/lttng-tracefile-rotation/README | 0 .../kernel/index/mychan_0_0.idx | Bin .../kernel/index/mychan_0_1.idx | Bin .../kernel/index/mychan_0_2.idx | Bin .../kernel/index/mychan_1_0.idx | Bin .../kernel/index/mychan_1_1.idx | Bin .../kernel/index/mychan_1_2.idx | Bin .../kernel/index/mychan_2_0.idx | Bin .../kernel/index/mychan_2_1.idx | Bin .../kernel/index/mychan_2_2.idx | Bin .../kernel/index/mychan_3_0.idx | Bin .../kernel/index/mychan_3_1.idx | Bin .../lttng-tracefile-rotation/kernel/metadata | Bin .../kernel/mychan_0_0 | Bin .../kernel/mychan_0_1 | Bin .../kernel/mychan_0_2 | Bin .../kernel/mychan_1_0 | Bin .../kernel/mychan_1_1 | Bin .../kernel/mychan_1_2 | Bin .../kernel/mychan_2_0 | Bin .../kernel/mychan_2_1 | Bin .../kernel/mychan_2_2 | Bin .../kernel/mychan_3_0 | Bin .../kernel/mychan_3_1 | Bin .../succeed/meta-ctx-sequence/metadata | 0 .../{ => 1}/succeed/meta-ctx-sequence/stream | 0 .../meta-variant-no-underscore/metadata | 0 .../succeed/meta-variant-no-underscore/stream | Bin .../meta-variant-one-underscore/metadata | 0 .../meta-variant-one-underscore/stream | Bin .../meta-variant-reserved-keywords/metadata | 0 .../meta-variant-reserved-keywords/stream | Bin .../metadata | 0 .../meta-variant-same-with-underscore/stream | Bin .../meta-variant-two-underscores/metadata | 0 .../meta-variant-two-underscores/stream | Bin .../kernel/index/kernel_channel_0.idx | Bin .../kernel/index/kernel_channel_1.idx | Bin .../kernel/index/kernel_channel_2.idx | Bin .../kernel/index/kernel_channel_3.idx | Bin .../multi-domains/kernel/kernel_channel_0 | Bin .../multi-domains/kernel/kernel_channel_1 | Bin .../multi-domains/kernel/kernel_channel_2 | Bin .../multi-domains/kernel/kernel_channel_3 | Bin .../succeed/multi-domains/kernel/metadata | Bin .../ust/index/ust2_channel_0.idx | Bin .../ust/index/ust2_channel_1.idx | Bin .../ust/index/ust2_channel_2.idx | Bin .../ust/index/ust2_channel_3.idx | Bin .../succeed/multi-domains/ust/metadata | Bin .../succeed/multi-domains/ust/ust2_channel_0 | Bin .../succeed/multi-domains/ust/ust2_channel_1 | Bin .../succeed/multi-domains/ust/ust2_channel_2 | Bin .../succeed/multi-domains/ust/ust2_channel_3 | Bin .../succeed/no-packet-context/metadata | 0 .../{ => 1}/succeed/no-packet-context/stream | Bin .../{ => 1}/succeed/sequence/channel0_0 | Bin .../{ => 1}/succeed/sequence/channel0_1 | Bin .../{ => 1}/succeed/sequence/channel0_2 | Bin .../{ => 1}/succeed/sequence/channel0_3 | Bin .../{ => 1}/succeed/sequence/metadata | 0 .../session-rotation/3/ust/pid/10352/chan_0 | Bin .../session-rotation/3/ust/pid/10352/chan_1 | Bin .../session-rotation/3/ust/pid/10352/chan_2 | Bin .../session-rotation/3/ust/pid/10352/chan_3 | Bin .../3/ust/pid/10352/index/chan_0.idx | Bin .../3/ust/pid/10352/index/chan_1.idx | Bin .../3/ust/pid/10352/index/chan_2.idx | Bin .../3/ust/pid/10352/index/chan_3.idx | Bin .../session-rotation/3/ust/pid/10352/metadata | Bin .../session-rotation/3/ust/pid/10353/chan_0 | Bin .../session-rotation/3/ust/pid/10353/chan_1 | Bin .../session-rotation/3/ust/pid/10353/chan_2 | Bin .../session-rotation/3/ust/pid/10353/chan_3 | Bin .../3/ust/pid/10353/index/chan_0.idx | Bin .../3/ust/pid/10353/index/chan_1.idx | Bin .../3/ust/pid/10353/index/chan_2.idx | Bin .../3/ust/pid/10353/index/chan_3.idx | Bin .../session-rotation/3/ust/pid/10353/metadata | Bin .../session-rotation/a/1/ust/pid/10352/chan_0 | Bin .../session-rotation/a/1/ust/pid/10352/chan_1 | Bin .../session-rotation/a/1/ust/pid/10352/chan_2 | Bin .../session-rotation/a/1/ust/pid/10352/chan_3 | Bin .../a/1/ust/pid/10352/index/chan_0.idx | Bin .../a/1/ust/pid/10352/index/chan_1.idx | Bin .../a/1/ust/pid/10352/index/chan_2.idx | Bin .../a/1/ust/pid/10352/index/chan_3.idx | Bin .../a/1/ust/pid/10352/metadata | Bin .../session-rotation/a/1/ust/pid/10353/chan_0 | Bin .../session-rotation/a/1/ust/pid/10353/chan_1 | Bin .../session-rotation/a/1/ust/pid/10353/chan_2 | Bin .../session-rotation/a/1/ust/pid/10353/chan_3 | Bin .../a/1/ust/pid/10353/index/chan_0.idx | Bin .../a/1/ust/pid/10353/index/chan_1.idx | Bin .../a/1/ust/pid/10353/index/chan_2.idx | Bin .../a/1/ust/pid/10353/index/chan_3.idx | Bin .../a/1/ust/pid/10353/metadata | Bin .../session-rotation/a/2/ust/pid/10352/chan_0 | Bin .../session-rotation/a/2/ust/pid/10352/chan_1 | Bin .../session-rotation/a/2/ust/pid/10352/chan_2 | 0 .../session-rotation/a/2/ust/pid/10352/chan_3 | Bin .../a/2/ust/pid/10352/index/chan_0.idx | Bin .../a/2/ust/pid/10352/index/chan_1.idx | Bin .../a/2/ust/pid/10352/index/chan_2.idx | Bin .../a/2/ust/pid/10352/index/chan_3.idx | Bin .../a/2/ust/pid/10352/metadata | Bin .../session-rotation/a/2/ust/pid/10353/chan_0 | Bin .../session-rotation/a/2/ust/pid/10353/chan_1 | 0 .../session-rotation/a/2/ust/pid/10353/chan_2 | Bin .../session-rotation/a/2/ust/pid/10353/chan_3 | 0 .../a/2/ust/pid/10353/index/chan_0.idx | Bin .../a/2/ust/pid/10353/index/chan_1.idx | Bin .../a/2/ust/pid/10353/index/chan_2.idx | Bin .../a/2/ust/pid/10353/index/chan_3.idx | Bin .../a/2/ust/pid/10353/metadata | Bin .../{ => 1}/succeed/smalltrace/dummystream | Bin .../{ => 1}/succeed/smalltrace/metadata | 0 .../succeed/struct-array-align-elem/metadata | 0 .../succeed/struct-array-align-elem/stream | 0 .../{ => 1}/succeed/succeed1/dummystream | Bin .../{ => 1}/succeed/succeed1/metadata | 0 .../{ => 1}/succeed/succeed2/dummystream | Bin .../{ => 1}/succeed/succeed2/metadata | 0 .../{ => 1}/succeed/succeed3/dummystream | Bin .../{ => 1}/succeed/succeed3/metadata | 0 .../{ => 1}/succeed/succeed4/metadata | 0 .../trace-with-index/index/ust_channel_0.idx | Bin .../trace-with-index/index/ust_channel_1.idx | Bin .../trace-with-index/index/ust_channel_2.idx | Bin .../trace-with-index/index/ust_channel_3.idx | Bin .../{ => 1}/succeed/trace-with-index/metadata | Bin .../succeed/trace-with-index/ust_channel_0 | Bin .../succeed/trace-with-index/ust_channel_1 | Bin .../succeed/trace-with-index/ust_channel_2 | Bin .../succeed/trace-with-index/ust_channel_3 | Bin .../{ => 1}/succeed/warnings/dummystream | Bin .../{ => 1}/succeed/warnings/metadata | 0 .../{ => 1}/succeed/wk-heartbeat-u/metadata | Bin .../{ => 1}/succeed/wk-heartbeat-u/u_0 | Bin .../{ => 1}/succeed/wk-heartbeat-u/u_1 | Bin .../{ => 1}/succeed/wk-heartbeat-u/u_2 | Bin .../{ => 1}/succeed/wk-heartbeat-u/u_3 | Bin .../{ => 1}/succeed/wk-heartbeat-u/u_4 | Bin .../{ => 1}/succeed/wk-heartbeat-u/u_5 | Bin .../{ => 1}/succeed/wk-heartbeat-u/u_6 | Bin .../{ => 1}/succeed/wk-heartbeat-u/u_7 | Bin .../flt.lttng-utils.debug-info/README.md | 8 ++--- .../data/plugins/src.ctf.lttng-live/base.json | 2 +- .../inactivity-discarded-packet.json | 2 +- .../src.ctf.lttng-live/list-sessions.json | 6 ++-- .../multi-domains-inverse.json | 4 +-- .../src.ctf.lttng-live/multi-domains.json | 4 +-- .../src.ctf.lttng-live/rate-limited.json | 2 +- .../src.ctf.lttng-live/split-metadata.json | 2 +- .../test-succeed.sh | 4 +-- .../sink.ctf.fs/succeed/test-succeed.sh | 14 ++++----- .../sink.text.details/succeed/test-succeed.sh | 2 +- tests/plugins/src.ctf.fs/fail/test-fail.sh | 2 +- .../query/test-query-metadata-info.sh | 2 +- .../query/test_query_support_info.py | 2 +- .../src.ctf.fs/query/test_query_trace_info.py | 29 ++++++++++++------ .../src.ctf.fs/succeed/test-succeed.sh | 4 +-- .../src.ctf.fs/test-deterministic-ordering.sh | 2 +- tests/plugins/src.ctf.lttng-live/test-live.sh | 8 ++--- 252 files changed, 79 insertions(+), 68 deletions(-) rename tests/data/ctf-traces/{ => 1}/deterministic-ordering/a-corrupted/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/deterministic-ordering/a-corrupted/metadata (100%) rename tests/data/ctf-traces/{ => 1}/deterministic-ordering/b-c.expect (100%) rename tests/data/ctf-traces/{ => 1}/deterministic-ordering/b-not-corrupted/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/deterministic-ordering/b-not-corrupted/metadata (100%) rename tests/data/ctf-traces/{ => 1}/deterministic-ordering/c-corrupted/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/deterministic-ordering/c-corrupted/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/fail1/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/fail/fail1/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/fail2/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/integer-range/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/invalid-packet-size/README (100%) rename tests/data/ctf-traces/{ => 1}/fail/invalid-packet-size/trace/channel0_3 (100%) rename tests/data/ctf-traces/{ => 1}/fail/invalid-packet-size/trace/index/channel0_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/fail/invalid-packet-size/trace/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/invalid-sequence-length-field-class/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/invalid-variant-selector-field-class/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/lttng-modules-2.0-pre1/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/metadata-syntax-error/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/packet-based-metadata/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/smalltrace/dummystream-fail (100%) rename tests/data/ctf-traces/{ => 1}/fail/smalltrace/metadata (100%) rename tests/data/ctf-traces/{ => 1}/fail/valid-events-then-invalid-events/README (100%) rename tests/data/ctf-traces/{ => 1}/fail/valid-events-then-invalid-events/trace/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/fail/valid-events-then-invalid-events/trace/metadata (100%) rename tests/data/ctf-traces/{ => 1}/intersection/3eventsintersect/metadata (100%) rename tests/data/ctf-traces/{ => 1}/intersection/3eventsintersect/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/intersection/3eventsintersect/test_stream_1 (100%) rename tests/data/ctf-traces/{ => 1}/intersection/3eventsintersectreverse/metadata (100%) rename tests/data/ctf-traces/{ => 1}/intersection/3eventsintersectreverse/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/intersection/3eventsintersectreverse/test_stream_1 (100%) rename tests/data/ctf-traces/{ => 1}/intersection/nointersect/metadata (100%) rename tests/data/ctf-traces/{ => 1}/intersection/nointersect/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/intersection/nointersect/test_stream_1 (100%) rename tests/data/ctf-traces/{ => 1}/intersection/nostream/metadata (100%) rename tests/data/ctf-traces/{ => 1}/intersection/onestream/metadata (100%) rename tests/data/ctf-traces/{ => 1}/intersection/onestream/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/live/new-streams/first-trace.mctf (100%) rename tests/data/ctf-traces/{ => 1}/live/new-streams/second-trace.mctf (100%) rename tests/data/ctf-traces/{ => 1}/live/split-metadata/channel0_0 (100%) rename tests/data/ctf-traces/{ => 1}/live/split-metadata/index/channel0_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/live/split-metadata/metadata (100%) rename tests/data/ctf-traces/{ => 1}/live/stored-values.mctf (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/2-lost-before-last/metadata (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/2-lost-before-last/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/2-streams-lost-in-1/metadata (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/2-streams-lost-in-1/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/2-streams-lost-in-1/test_stream_1 (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/2-streams-lost-in-2/metadata (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/2-streams-lost-in-2/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/2-streams-lost-in-2/test_stream_1 (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/7-lost-between-2-with-index/index/stream_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/7-lost-between-2-with-index/metadata (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/7-lost-between-2-with-index/stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/no-lost-not-starting-at-0/metadata (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/no-lost-not-starting-at-0/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/no-lost/metadata (100%) rename tests/data/ctf-traces/{ => 1}/packet-seq-num/no-lost/test_stream_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/2packets/channel0_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/2packets/index/channel0_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/2packets/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/array-align-elem/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/array-align-elem/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/barectf-event-before-packet/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/barectf-event-before-packet/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/crlf-metadata/channel0_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/crlf-metadata/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/debug-info/channel0_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/debug-info/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/env-warning/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/env-warning/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/ev-disc-no-ts-begin-end/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/ev-disc-no-ts-begin-end/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lf-metadata/channel0_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lf-metadata/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-crash/chan_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-crash/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-event-after-packet/chan_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-event-after-packet/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/README (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_0_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_0_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_0_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_1_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_1_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_1_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_2_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_2_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_2_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_3_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/lttng-tracefile-rotation/kernel/mychan_3_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-ctx-sequence/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-ctx-sequence/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-no-underscore/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-no-underscore/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-one-underscore/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-one-underscore/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-reserved-keywords/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-reserved-keywords/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-same-with-underscore/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-same-with-underscore/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-two-underscores/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/meta-variant-two-underscores/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/index/kernel_channel_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/index/kernel_channel_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/index/kernel_channel_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/index/kernel_channel_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/kernel_channel_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/kernel_channel_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/kernel_channel_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/kernel_channel_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/kernel/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/index/ust2_channel_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/index/ust2_channel_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/index/ust2_channel_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/index/ust2_channel_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/ust2_channel_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/ust2_channel_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/ust2_channel_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/multi-domains/ust/ust2_channel_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/no-packet-context/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/no-packet-context/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/sequence/channel0_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/sequence/channel0_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/sequence/channel0_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/sequence/channel0_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/sequence/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/chan_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/chan_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/chan_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/chan_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/index/chan_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/index/chan_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/index/chan_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/index/chan_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10352/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/chan_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/chan_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/chan_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/chan_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/index/chan_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/index/chan_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/index/chan_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/index/chan_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/3/ust/pid/10353/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/chan_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/chan_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/chan_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/chan_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/index/chan_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/index/chan_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/index/chan_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/index/chan_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10352/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/chan_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/chan_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/chan_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/chan_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/index/chan_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/index/chan_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/index/chan_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/index/chan_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/1/ust/pid/10353/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/chan_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/chan_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/chan_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/chan_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/index/chan_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/index/chan_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/index/chan_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/index/chan_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10352/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/chan_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/chan_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/chan_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/chan_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/index/chan_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/index/chan_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/index/chan_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/index/chan_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/session-rotation/a/2/ust/pid/10353/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/smalltrace/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/smalltrace/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/struct-array-align-elem/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/struct-array-align-elem/stream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/succeed1/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/succeed1/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/succeed2/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/succeed2/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/succeed3/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/succeed3/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/succeed4/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/index/ust_channel_0.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/index/ust_channel_1.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/index/ust_channel_2.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/index/ust_channel_3.idx (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/ust_channel_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/ust_channel_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/ust_channel_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/trace-with-index/ust_channel_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/warnings/dummystream (100%) rename tests/data/ctf-traces/{ => 1}/succeed/warnings/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/metadata (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/u_0 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/u_1 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/u_2 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/u_3 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/u_4 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/u_5 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/u_6 (100%) rename tests/data/ctf-traces/{ => 1}/succeed/wk-heartbeat-u/u_7 (100%) diff --git a/tests/bindings/python/bt2/test_trace_collection_message_iterator.py b/tests/bindings/python/bt2/test_trace_collection_message_iterator.py index 53d838fc..a31effcc 100644 --- a/tests/bindings/python/bt2/test_trace_collection_message_iterator.py +++ b/tests/bindings/python/bt2/test_trace_collection_message_iterator.py @@ -13,12 +13,12 @@ import bt2 _BT_TESTS_DATADIR = os.environ["BT_TESTS_DATADIR"] _BT_CTF_TRACES_PATH = os.environ["BT_CTF_TRACES_PATH"] _3EVENTS_INTERSECT_TRACE_PATH = os.path.join( - _BT_CTF_TRACES_PATH, "intersection", "3eventsintersect" + _BT_CTF_TRACES_PATH, "1", "intersection", "3eventsintersect" ) _NOINTERSECT_TRACE_PATH = os.path.join( - _BT_CTF_TRACES_PATH, "intersection", "nointersect" + _BT_CTF_TRACES_PATH, "1", "intersection", "nointersect" ) -_SEQUENCE_TRACE_PATH = os.path.join(_BT_CTF_TRACES_PATH, "succeed", "sequence") +_SEQUENCE_TRACE_PATH = os.path.join(_BT_CTF_TRACES_PATH, "1", "succeed", "sequence") _AUTO_SOURCE_DISCOVERY_GROUPING_PATH = os.path.join( _BT_TESTS_DATADIR, "auto-source-discovery", "grouping" ) @@ -27,7 +27,7 @@ _AUTO_SOURCE_DISCOVERY_PARAMS_LOG_LEVEL_PATH = os.path.join( ) _METADATA_SYNTAX_ERROR_TRACE_PATH = os.path.join( - _BT_CTF_TRACES_PATH, "fail", "metadata-syntax-error" + _BT_CTF_TRACES_PATH, "1", "fail", "metadata-syntax-error" ) _BT_ENABLE_PYTHON_PLUGINS = os.environ["BT_TESTS_ENABLE_PYTHON_PLUGINS"] == "1" diff --git a/tests/cli/convert/test-convert-args.sh b/tests/cli/convert/test-convert-args.sh index ac4c2b52..89e895fd 100755 --- a/tests/cli/convert/test-convert-args.sh +++ b/tests/cli/convert/test-convert-args.sh @@ -66,8 +66,8 @@ test_bt_convert_fails() { fi } -path_to_trace="${BT_CTF_TRACES_PATH}/succeed/succeed1" -path_to_trace2="${BT_CTF_TRACES_PATH}/succeed/succeed2" +path_to_trace="${BT_CTF_TRACES_PATH}/1/succeed/succeed1" +path_to_trace2="${BT_CTF_TRACES_PATH}/1/succeed/succeed2" output_path="/output/path" if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then diff --git a/tests/cli/test-intersection.sh b/tests/cli/test-intersection.sh index 18711c56..ff1193dc 100755 --- a/tests/cli/test-intersection.sh +++ b/tests/cli/test-intersection.sh @@ -67,20 +67,20 @@ test_intersect_fails() { diag "Test the stream intersection feature" diag "2 streams offsetted with 3 packets intersecting" -test_intersect "${BT_CTF_TRACES_PATH}/intersection/3eventsintersect" 8 3 +test_intersect "${BT_CTF_TRACES_PATH}/1/intersection/3eventsintersect" 8 3 diag "2 streams offsetted with 3 packets intersecting (exchanged file names)" -test_intersect "${BT_CTF_TRACES_PATH}/intersection/3eventsintersectreverse" 8 3 +test_intersect "${BT_CTF_TRACES_PATH}/1/intersection/3eventsintersectreverse" 8 3 diag "Only 1 stream" -test_intersect "${BT_CTF_TRACES_PATH}/intersection/onestream" 3 3 +test_intersect "${BT_CTF_TRACES_PATH}/1/intersection/onestream" 3 3 diag "No intersection between 2 streams" -test_intersect_fails "${BT_CTF_TRACES_PATH}/intersection/nointersect" 6 \ +test_intersect_fails "${BT_CTF_TRACES_PATH}/1/intersection/nointersect" 6 \ "Trimming time range's beginning time is greater than end time: " diag "No stream at all" -test_intersect_fails "${BT_CTF_TRACES_PATH}/intersection/nostream" 0 \ +test_intersect_fails "${BT_CTF_TRACES_PATH}/1/intersection/nostream" 0 \ "Trace has no streams: " rm -f "${stdout}" "${stderr}" diff --git a/tests/cli/test-output-ctf-metadata.sh b/tests/cli/test-output-ctf-metadata.sh index f85fc053..28aa2a10 100755 --- a/tests/cli/test-output-ctf-metadata.sh +++ b/tests/cli/test-output-ctf-metadata.sh @@ -23,7 +23,7 @@ plan_tests $NUM_TESTS tmp_metadata=$(mktemp) # Test a valid trace directory. -"${BT_TESTS_BT2_BIN}" -o ctf-metadata "${BT_CTF_TRACES_PATH}/succeed/wk-heartbeat-u" > "$tmp_metadata" +"${BT_TESTS_BT2_BIN}" -o ctf-metadata "${BT_CTF_TRACES_PATH}/1/succeed/wk-heartbeat-u" > "$tmp_metadata" ok $? "Run babeltrace -o ctf-metadata with a valid trace directory, correct exit status" bt_diff "${BT_TESTS_DATADIR}/cli/test-output-ctf-metadata.ref" "$tmp_metadata" diff --git a/tests/cli/test-output-path-ctf-non-lttng-trace.sh b/tests/cli/test-output-path-ctf-non-lttng-trace.sh index d589dbe1..7a5b02a6 100755 --- a/tests/cli/test-output-path-ctf-non-lttng-trace.sh +++ b/tests/cli/test-output-path-ctf-non-lttng-trace.sh @@ -32,13 +32,13 @@ temp_input_dir=$(mktemp -t -d test-output-path-ctf-non-lttng-trace-input.XXXXXX) temp_output_dir=$(mktemp -t -d test-output-path-ctf-non-lttng-trace-output.XXXXXX) mkdir -p "${temp_input_dir}/a/b/c" -cp -a "${BT_CTF_TRACES_PATH}/intersection/3eventsintersect" "${temp_input_dir}/a/b/c" +cp -a "${BT_CTF_TRACES_PATH}/1/intersection/3eventsintersect" "${temp_input_dir}/a/b/c" mkdir -p "${temp_input_dir}/a/b/c" -cp -a "${BT_CTF_TRACES_PATH}/intersection/3eventsintersectreverse" "${temp_input_dir}/a/b/c" +cp -a "${BT_CTF_TRACES_PATH}/1/intersection/3eventsintersectreverse" "${temp_input_dir}/a/b/c" mkdir -p "${temp_input_dir}/d/e/f" -cp -a "${BT_CTF_TRACES_PATH}/intersection/nointersect" "${temp_input_dir}/d/e/f" +cp -a "${BT_CTF_TRACES_PATH}/1/intersection/nointersect" "${temp_input_dir}/d/e/f" bt_cli "/dev/null" "/dev/null" "${temp_input_dir}" -c sink.ctf.fs -p "path=\"${temp_output_dir}\"" diff --git a/tests/cli/test-packet-seq-num.sh b/tests/cli/test-packet-seq-num.sh index 8c838058..253694c4 100755 --- a/tests/cli/test-packet-seq-num.sh +++ b/tests/cli/test-packet-seq-num.sh @@ -54,16 +54,16 @@ test_lost() { diag "Test the packet_seq_num validation" diag "No packet lost" -test_no_lost "${BT_CTF_TRACES_PATH}/packet-seq-num/no-lost" +test_no_lost "${BT_CTF_TRACES_PATH}/1/packet-seq-num/no-lost" diag "No packet lost, packet_seq_num not starting at 0" -test_no_lost "${BT_CTF_TRACES_PATH}/packet-seq-num/no-lost-not-starting-at-0" +test_no_lost "${BT_CTF_TRACES_PATH}/1/packet-seq-num/no-lost-not-starting-at-0" diag "1 stream, 2 packets lost before the last packet" -test_lost "${BT_CTF_TRACES_PATH}/packet-seq-num/2-lost-before-last" "2" +test_lost "${BT_CTF_TRACES_PATH}/1/packet-seq-num/2-lost-before-last" "2" diag "2 streams, packets lost in one of them" -test_lost "${BT_CTF_TRACES_PATH}/packet-seq-num/2-streams-lost-in-1" "2" +test_lost "${BT_CTF_TRACES_PATH}/1/packet-seq-num/2-streams-lost-in-1" "2" diag "2 streams, packets lost in both" -test_lost "${BT_CTF_TRACES_PATH}/packet-seq-num/2-streams-lost-in-2" "2,3,1" +test_lost "${BT_CTF_TRACES_PATH}/1/packet-seq-num/2-streams-lost-in-2" "2,3,1" diff --git a/tests/cli/test-trace-copy.sh b/tests/cli/test-trace-copy.sh index 5b9f9ad5..40cc002c 100755 --- a/tests/cli/test-trace-copy.sh +++ b/tests/cli/test-trace-copy.sh @@ -20,7 +20,7 @@ clean_tmp() { rm -rf "${out_path}" "${text_output1}" "${text_output2_intermediary}" "${text_output2}" "${stderr_file}" } -SUCCESS_TRACES=("${BT_CTF_TRACES_PATH}/succeed/"*) +SUCCESS_TRACES=("${BT_CTF_TRACES_PATH}/1/succeed/"*) # -4 because there are two empty traces that we skip NUM_TESTS=$((${#SUCCESS_TRACES[@]} * 3 - 4)) diff --git a/tests/cli/test-trace-read.sh b/tests/cli/test-trace-read.sh index 474015e0..b3a30a7e 100755 --- a/tests/cli/test-trace-read.sh +++ b/tests/cli/test-trace-read.sh @@ -16,8 +16,8 @@ fi # shellcheck source=../utils/utils.sh source "$UTILSSH" -SUCCESS_TRACES=("${BT_CTF_TRACES_PATH}/succeed/"*) -FAIL_TRACES=("${BT_CTF_TRACES_PATH}/fail/"*) +SUCCESS_TRACES=("${BT_CTF_TRACES_PATH}/1/succeed/"*) +FAIL_TRACES=("${BT_CTF_TRACES_PATH}/1/fail/"*) NUM_TESTS=$((${#SUCCESS_TRACES[@]} + ${#FAIL_TRACES[@]})) diff --git a/tests/cli/test-trimmer.sh b/tests/cli/test-trimmer.sh index 4b415b47..bf5ed4b8 100755 --- a/tests/cli/test-trimmer.sh +++ b/tests/cli/test-trimmer.sh @@ -16,7 +16,7 @@ fi # shellcheck source=../utils/utils.sh source "$UTILSSH" -TRACE_PATH="${BT_CTF_TRACES_PATH}/succeed/wk-heartbeat-u/" +TRACE_PATH="${BT_CTF_TRACES_PATH}/1/succeed/wk-heartbeat-u/" NUM_TESTS=118 diff --git a/tests/data/ctf-traces/deterministic-ordering/a-corrupted/dummystream b/tests/data/ctf-traces/1/deterministic-ordering/a-corrupted/dummystream similarity index 100% rename from tests/data/ctf-traces/deterministic-ordering/a-corrupted/dummystream rename to tests/data/ctf-traces/1/deterministic-ordering/a-corrupted/dummystream diff --git a/tests/data/ctf-traces/deterministic-ordering/a-corrupted/metadata b/tests/data/ctf-traces/1/deterministic-ordering/a-corrupted/metadata similarity index 100% rename from tests/data/ctf-traces/deterministic-ordering/a-corrupted/metadata rename to tests/data/ctf-traces/1/deterministic-ordering/a-corrupted/metadata diff --git a/tests/data/ctf-traces/deterministic-ordering/b-c.expect b/tests/data/ctf-traces/1/deterministic-ordering/b-c.expect similarity index 100% rename from tests/data/ctf-traces/deterministic-ordering/b-c.expect rename to tests/data/ctf-traces/1/deterministic-ordering/b-c.expect diff --git a/tests/data/ctf-traces/deterministic-ordering/b-not-corrupted/dummystream b/tests/data/ctf-traces/1/deterministic-ordering/b-not-corrupted/dummystream similarity index 100% rename from tests/data/ctf-traces/deterministic-ordering/b-not-corrupted/dummystream rename to tests/data/ctf-traces/1/deterministic-ordering/b-not-corrupted/dummystream diff --git a/tests/data/ctf-traces/deterministic-ordering/b-not-corrupted/metadata b/tests/data/ctf-traces/1/deterministic-ordering/b-not-corrupted/metadata similarity index 100% rename from tests/data/ctf-traces/deterministic-ordering/b-not-corrupted/metadata rename to tests/data/ctf-traces/1/deterministic-ordering/b-not-corrupted/metadata diff --git a/tests/data/ctf-traces/deterministic-ordering/c-corrupted/dummystream b/tests/data/ctf-traces/1/deterministic-ordering/c-corrupted/dummystream similarity index 100% rename from tests/data/ctf-traces/deterministic-ordering/c-corrupted/dummystream rename to tests/data/ctf-traces/1/deterministic-ordering/c-corrupted/dummystream diff --git a/tests/data/ctf-traces/deterministic-ordering/c-corrupted/metadata b/tests/data/ctf-traces/1/deterministic-ordering/c-corrupted/metadata similarity index 100% rename from tests/data/ctf-traces/deterministic-ordering/c-corrupted/metadata rename to tests/data/ctf-traces/1/deterministic-ordering/c-corrupted/metadata diff --git a/tests/data/ctf-traces/fail/fail1/dummystream b/tests/data/ctf-traces/1/fail/fail1/dummystream similarity index 100% rename from tests/data/ctf-traces/fail/fail1/dummystream rename to tests/data/ctf-traces/1/fail/fail1/dummystream diff --git a/tests/data/ctf-traces/fail/fail1/metadata b/tests/data/ctf-traces/1/fail/fail1/metadata similarity index 100% rename from tests/data/ctf-traces/fail/fail1/metadata rename to tests/data/ctf-traces/1/fail/fail1/metadata diff --git a/tests/data/ctf-traces/fail/fail2/metadata b/tests/data/ctf-traces/1/fail/fail2/metadata similarity index 100% rename from tests/data/ctf-traces/fail/fail2/metadata rename to tests/data/ctf-traces/1/fail/fail2/metadata diff --git a/tests/data/ctf-traces/fail/integer-range/metadata b/tests/data/ctf-traces/1/fail/integer-range/metadata similarity index 100% rename from tests/data/ctf-traces/fail/integer-range/metadata rename to tests/data/ctf-traces/1/fail/integer-range/metadata diff --git a/tests/data/ctf-traces/fail/invalid-packet-size/README b/tests/data/ctf-traces/1/fail/invalid-packet-size/README similarity index 100% rename from tests/data/ctf-traces/fail/invalid-packet-size/README rename to tests/data/ctf-traces/1/fail/invalid-packet-size/README diff --git a/tests/data/ctf-traces/fail/invalid-packet-size/trace/channel0_3 b/tests/data/ctf-traces/1/fail/invalid-packet-size/trace/channel0_3 similarity index 100% rename from tests/data/ctf-traces/fail/invalid-packet-size/trace/channel0_3 rename to tests/data/ctf-traces/1/fail/invalid-packet-size/trace/channel0_3 diff --git a/tests/data/ctf-traces/fail/invalid-packet-size/trace/index/channel0_3.idx b/tests/data/ctf-traces/1/fail/invalid-packet-size/trace/index/channel0_3.idx similarity index 100% rename from tests/data/ctf-traces/fail/invalid-packet-size/trace/index/channel0_3.idx rename to tests/data/ctf-traces/1/fail/invalid-packet-size/trace/index/channel0_3.idx diff --git a/tests/data/ctf-traces/fail/invalid-packet-size/trace/metadata b/tests/data/ctf-traces/1/fail/invalid-packet-size/trace/metadata similarity index 100% rename from tests/data/ctf-traces/fail/invalid-packet-size/trace/metadata rename to tests/data/ctf-traces/1/fail/invalid-packet-size/trace/metadata diff --git a/tests/data/ctf-traces/fail/invalid-sequence-length-field-class/metadata b/tests/data/ctf-traces/1/fail/invalid-sequence-length-field-class/metadata similarity index 100% rename from tests/data/ctf-traces/fail/invalid-sequence-length-field-class/metadata rename to tests/data/ctf-traces/1/fail/invalid-sequence-length-field-class/metadata diff --git a/tests/data/ctf-traces/fail/invalid-variant-selector-field-class/metadata b/tests/data/ctf-traces/1/fail/invalid-variant-selector-field-class/metadata similarity index 100% rename from tests/data/ctf-traces/fail/invalid-variant-selector-field-class/metadata rename to tests/data/ctf-traces/1/fail/invalid-variant-selector-field-class/metadata diff --git a/tests/data/ctf-traces/fail/lttng-modules-2.0-pre1/metadata b/tests/data/ctf-traces/1/fail/lttng-modules-2.0-pre1/metadata similarity index 100% rename from tests/data/ctf-traces/fail/lttng-modules-2.0-pre1/metadata rename to tests/data/ctf-traces/1/fail/lttng-modules-2.0-pre1/metadata diff --git a/tests/data/ctf-traces/fail/metadata-syntax-error/metadata b/tests/data/ctf-traces/1/fail/metadata-syntax-error/metadata similarity index 100% rename from tests/data/ctf-traces/fail/metadata-syntax-error/metadata rename to tests/data/ctf-traces/1/fail/metadata-syntax-error/metadata diff --git a/tests/data/ctf-traces/fail/packet-based-metadata/metadata b/tests/data/ctf-traces/1/fail/packet-based-metadata/metadata similarity index 100% rename from tests/data/ctf-traces/fail/packet-based-metadata/metadata rename to tests/data/ctf-traces/1/fail/packet-based-metadata/metadata diff --git a/tests/data/ctf-traces/fail/smalltrace/dummystream-fail b/tests/data/ctf-traces/1/fail/smalltrace/dummystream-fail similarity index 100% rename from tests/data/ctf-traces/fail/smalltrace/dummystream-fail rename to tests/data/ctf-traces/1/fail/smalltrace/dummystream-fail diff --git a/tests/data/ctf-traces/fail/smalltrace/metadata b/tests/data/ctf-traces/1/fail/smalltrace/metadata similarity index 100% rename from tests/data/ctf-traces/fail/smalltrace/metadata rename to tests/data/ctf-traces/1/fail/smalltrace/metadata diff --git a/tests/data/ctf-traces/fail/valid-events-then-invalid-events/README b/tests/data/ctf-traces/1/fail/valid-events-then-invalid-events/README similarity index 100% rename from tests/data/ctf-traces/fail/valid-events-then-invalid-events/README rename to tests/data/ctf-traces/1/fail/valid-events-then-invalid-events/README diff --git a/tests/data/ctf-traces/fail/valid-events-then-invalid-events/trace/dummystream b/tests/data/ctf-traces/1/fail/valid-events-then-invalid-events/trace/dummystream similarity index 100% rename from tests/data/ctf-traces/fail/valid-events-then-invalid-events/trace/dummystream rename to tests/data/ctf-traces/1/fail/valid-events-then-invalid-events/trace/dummystream diff --git a/tests/data/ctf-traces/fail/valid-events-then-invalid-events/trace/metadata b/tests/data/ctf-traces/1/fail/valid-events-then-invalid-events/trace/metadata similarity index 100% rename from tests/data/ctf-traces/fail/valid-events-then-invalid-events/trace/metadata rename to tests/data/ctf-traces/1/fail/valid-events-then-invalid-events/trace/metadata diff --git a/tests/data/ctf-traces/intersection/3eventsintersect/metadata b/tests/data/ctf-traces/1/intersection/3eventsintersect/metadata similarity index 100% rename from tests/data/ctf-traces/intersection/3eventsintersect/metadata rename to tests/data/ctf-traces/1/intersection/3eventsintersect/metadata diff --git a/tests/data/ctf-traces/intersection/3eventsintersect/test_stream_0 b/tests/data/ctf-traces/1/intersection/3eventsintersect/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/intersection/3eventsintersect/test_stream_0 rename to tests/data/ctf-traces/1/intersection/3eventsintersect/test_stream_0 diff --git a/tests/data/ctf-traces/intersection/3eventsintersect/test_stream_1 b/tests/data/ctf-traces/1/intersection/3eventsintersect/test_stream_1 similarity index 100% rename from tests/data/ctf-traces/intersection/3eventsintersect/test_stream_1 rename to tests/data/ctf-traces/1/intersection/3eventsintersect/test_stream_1 diff --git a/tests/data/ctf-traces/intersection/3eventsintersectreverse/metadata b/tests/data/ctf-traces/1/intersection/3eventsintersectreverse/metadata similarity index 100% rename from tests/data/ctf-traces/intersection/3eventsintersectreverse/metadata rename to tests/data/ctf-traces/1/intersection/3eventsintersectreverse/metadata diff --git a/tests/data/ctf-traces/intersection/3eventsintersectreverse/test_stream_0 b/tests/data/ctf-traces/1/intersection/3eventsintersectreverse/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/intersection/3eventsintersectreverse/test_stream_0 rename to tests/data/ctf-traces/1/intersection/3eventsintersectreverse/test_stream_0 diff --git a/tests/data/ctf-traces/intersection/3eventsintersectreverse/test_stream_1 b/tests/data/ctf-traces/1/intersection/3eventsintersectreverse/test_stream_1 similarity index 100% rename from tests/data/ctf-traces/intersection/3eventsintersectreverse/test_stream_1 rename to tests/data/ctf-traces/1/intersection/3eventsintersectreverse/test_stream_1 diff --git a/tests/data/ctf-traces/intersection/nointersect/metadata b/tests/data/ctf-traces/1/intersection/nointersect/metadata similarity index 100% rename from tests/data/ctf-traces/intersection/nointersect/metadata rename to tests/data/ctf-traces/1/intersection/nointersect/metadata diff --git a/tests/data/ctf-traces/intersection/nointersect/test_stream_0 b/tests/data/ctf-traces/1/intersection/nointersect/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/intersection/nointersect/test_stream_0 rename to tests/data/ctf-traces/1/intersection/nointersect/test_stream_0 diff --git a/tests/data/ctf-traces/intersection/nointersect/test_stream_1 b/tests/data/ctf-traces/1/intersection/nointersect/test_stream_1 similarity index 100% rename from tests/data/ctf-traces/intersection/nointersect/test_stream_1 rename to tests/data/ctf-traces/1/intersection/nointersect/test_stream_1 diff --git a/tests/data/ctf-traces/intersection/nostream/metadata b/tests/data/ctf-traces/1/intersection/nostream/metadata similarity index 100% rename from tests/data/ctf-traces/intersection/nostream/metadata rename to tests/data/ctf-traces/1/intersection/nostream/metadata diff --git a/tests/data/ctf-traces/intersection/onestream/metadata b/tests/data/ctf-traces/1/intersection/onestream/metadata similarity index 100% rename from tests/data/ctf-traces/intersection/onestream/metadata rename to tests/data/ctf-traces/1/intersection/onestream/metadata diff --git a/tests/data/ctf-traces/intersection/onestream/test_stream_0 b/tests/data/ctf-traces/1/intersection/onestream/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/intersection/onestream/test_stream_0 rename to tests/data/ctf-traces/1/intersection/onestream/test_stream_0 diff --git a/tests/data/ctf-traces/live/new-streams/first-trace.mctf b/tests/data/ctf-traces/1/live/new-streams/first-trace.mctf similarity index 100% rename from tests/data/ctf-traces/live/new-streams/first-trace.mctf rename to tests/data/ctf-traces/1/live/new-streams/first-trace.mctf diff --git a/tests/data/ctf-traces/live/new-streams/second-trace.mctf b/tests/data/ctf-traces/1/live/new-streams/second-trace.mctf similarity index 100% rename from tests/data/ctf-traces/live/new-streams/second-trace.mctf rename to tests/data/ctf-traces/1/live/new-streams/second-trace.mctf diff --git a/tests/data/ctf-traces/live/split-metadata/channel0_0 b/tests/data/ctf-traces/1/live/split-metadata/channel0_0 similarity index 100% rename from tests/data/ctf-traces/live/split-metadata/channel0_0 rename to tests/data/ctf-traces/1/live/split-metadata/channel0_0 diff --git a/tests/data/ctf-traces/live/split-metadata/index/channel0_0.idx b/tests/data/ctf-traces/1/live/split-metadata/index/channel0_0.idx similarity index 100% rename from tests/data/ctf-traces/live/split-metadata/index/channel0_0.idx rename to tests/data/ctf-traces/1/live/split-metadata/index/channel0_0.idx diff --git a/tests/data/ctf-traces/live/split-metadata/metadata b/tests/data/ctf-traces/1/live/split-metadata/metadata similarity index 100% rename from tests/data/ctf-traces/live/split-metadata/metadata rename to tests/data/ctf-traces/1/live/split-metadata/metadata diff --git a/tests/data/ctf-traces/live/stored-values.mctf b/tests/data/ctf-traces/1/live/stored-values.mctf similarity index 100% rename from tests/data/ctf-traces/live/stored-values.mctf rename to tests/data/ctf-traces/1/live/stored-values.mctf diff --git a/tests/data/ctf-traces/packet-seq-num/2-lost-before-last/metadata b/tests/data/ctf-traces/1/packet-seq-num/2-lost-before-last/metadata similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/2-lost-before-last/metadata rename to tests/data/ctf-traces/1/packet-seq-num/2-lost-before-last/metadata diff --git a/tests/data/ctf-traces/packet-seq-num/2-lost-before-last/test_stream_0 b/tests/data/ctf-traces/1/packet-seq-num/2-lost-before-last/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/2-lost-before-last/test_stream_0 rename to tests/data/ctf-traces/1/packet-seq-num/2-lost-before-last/test_stream_0 diff --git a/tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-1/metadata b/tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-1/metadata similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-1/metadata rename to tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-1/metadata diff --git a/tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-1/test_stream_0 b/tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-1/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-1/test_stream_0 rename to tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-1/test_stream_0 diff --git a/tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-1/test_stream_1 b/tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-1/test_stream_1 similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-1/test_stream_1 rename to tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-1/test_stream_1 diff --git a/tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-2/metadata b/tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-2/metadata similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-2/metadata rename to tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-2/metadata diff --git a/tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-2/test_stream_0 b/tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-2/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-2/test_stream_0 rename to tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-2/test_stream_0 diff --git a/tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-2/test_stream_1 b/tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-2/test_stream_1 similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/2-streams-lost-in-2/test_stream_1 rename to tests/data/ctf-traces/1/packet-seq-num/2-streams-lost-in-2/test_stream_1 diff --git a/tests/data/ctf-traces/packet-seq-num/7-lost-between-2-with-index/index/stream_0.idx b/tests/data/ctf-traces/1/packet-seq-num/7-lost-between-2-with-index/index/stream_0.idx similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/7-lost-between-2-with-index/index/stream_0.idx rename to tests/data/ctf-traces/1/packet-seq-num/7-lost-between-2-with-index/index/stream_0.idx diff --git a/tests/data/ctf-traces/packet-seq-num/7-lost-between-2-with-index/metadata b/tests/data/ctf-traces/1/packet-seq-num/7-lost-between-2-with-index/metadata similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/7-lost-between-2-with-index/metadata rename to tests/data/ctf-traces/1/packet-seq-num/7-lost-between-2-with-index/metadata diff --git a/tests/data/ctf-traces/packet-seq-num/7-lost-between-2-with-index/stream_0 b/tests/data/ctf-traces/1/packet-seq-num/7-lost-between-2-with-index/stream_0 similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/7-lost-between-2-with-index/stream_0 rename to tests/data/ctf-traces/1/packet-seq-num/7-lost-between-2-with-index/stream_0 diff --git a/tests/data/ctf-traces/packet-seq-num/no-lost-not-starting-at-0/metadata b/tests/data/ctf-traces/1/packet-seq-num/no-lost-not-starting-at-0/metadata similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/no-lost-not-starting-at-0/metadata rename to tests/data/ctf-traces/1/packet-seq-num/no-lost-not-starting-at-0/metadata diff --git a/tests/data/ctf-traces/packet-seq-num/no-lost-not-starting-at-0/test_stream_0 b/tests/data/ctf-traces/1/packet-seq-num/no-lost-not-starting-at-0/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/no-lost-not-starting-at-0/test_stream_0 rename to tests/data/ctf-traces/1/packet-seq-num/no-lost-not-starting-at-0/test_stream_0 diff --git a/tests/data/ctf-traces/packet-seq-num/no-lost/metadata b/tests/data/ctf-traces/1/packet-seq-num/no-lost/metadata similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/no-lost/metadata rename to tests/data/ctf-traces/1/packet-seq-num/no-lost/metadata diff --git a/tests/data/ctf-traces/packet-seq-num/no-lost/test_stream_0 b/tests/data/ctf-traces/1/packet-seq-num/no-lost/test_stream_0 similarity index 100% rename from tests/data/ctf-traces/packet-seq-num/no-lost/test_stream_0 rename to tests/data/ctf-traces/1/packet-seq-num/no-lost/test_stream_0 diff --git a/tests/data/ctf-traces/succeed/2packets/channel0_2 b/tests/data/ctf-traces/1/succeed/2packets/channel0_2 similarity index 100% rename from tests/data/ctf-traces/succeed/2packets/channel0_2 rename to tests/data/ctf-traces/1/succeed/2packets/channel0_2 diff --git a/tests/data/ctf-traces/succeed/2packets/index/channel0_2.idx b/tests/data/ctf-traces/1/succeed/2packets/index/channel0_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/2packets/index/channel0_2.idx rename to tests/data/ctf-traces/1/succeed/2packets/index/channel0_2.idx diff --git a/tests/data/ctf-traces/succeed/2packets/metadata b/tests/data/ctf-traces/1/succeed/2packets/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/2packets/metadata rename to tests/data/ctf-traces/1/succeed/2packets/metadata diff --git a/tests/data/ctf-traces/succeed/array-align-elem/metadata b/tests/data/ctf-traces/1/succeed/array-align-elem/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/array-align-elem/metadata rename to tests/data/ctf-traces/1/succeed/array-align-elem/metadata diff --git a/tests/data/ctf-traces/succeed/array-align-elem/stream b/tests/data/ctf-traces/1/succeed/array-align-elem/stream similarity index 100% rename from tests/data/ctf-traces/succeed/array-align-elem/stream rename to tests/data/ctf-traces/1/succeed/array-align-elem/stream diff --git a/tests/data/ctf-traces/succeed/barectf-event-before-packet/metadata b/tests/data/ctf-traces/1/succeed/barectf-event-before-packet/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/barectf-event-before-packet/metadata rename to tests/data/ctf-traces/1/succeed/barectf-event-before-packet/metadata diff --git a/tests/data/ctf-traces/succeed/barectf-event-before-packet/stream b/tests/data/ctf-traces/1/succeed/barectf-event-before-packet/stream similarity index 100% rename from tests/data/ctf-traces/succeed/barectf-event-before-packet/stream rename to tests/data/ctf-traces/1/succeed/barectf-event-before-packet/stream diff --git a/tests/data/ctf-traces/succeed/crlf-metadata/channel0_0 b/tests/data/ctf-traces/1/succeed/crlf-metadata/channel0_0 similarity index 100% rename from tests/data/ctf-traces/succeed/crlf-metadata/channel0_0 rename to tests/data/ctf-traces/1/succeed/crlf-metadata/channel0_0 diff --git a/tests/data/ctf-traces/succeed/crlf-metadata/metadata b/tests/data/ctf-traces/1/succeed/crlf-metadata/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/crlf-metadata/metadata rename to tests/data/ctf-traces/1/succeed/crlf-metadata/metadata diff --git a/tests/data/ctf-traces/succeed/debug-info/channel0_0 b/tests/data/ctf-traces/1/succeed/debug-info/channel0_0 similarity index 100% rename from tests/data/ctf-traces/succeed/debug-info/channel0_0 rename to tests/data/ctf-traces/1/succeed/debug-info/channel0_0 diff --git a/tests/data/ctf-traces/succeed/debug-info/metadata b/tests/data/ctf-traces/1/succeed/debug-info/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/debug-info/metadata rename to tests/data/ctf-traces/1/succeed/debug-info/metadata diff --git a/tests/data/ctf-traces/succeed/env-warning/dummystream b/tests/data/ctf-traces/1/succeed/env-warning/dummystream similarity index 100% rename from tests/data/ctf-traces/succeed/env-warning/dummystream rename to tests/data/ctf-traces/1/succeed/env-warning/dummystream diff --git a/tests/data/ctf-traces/succeed/env-warning/metadata b/tests/data/ctf-traces/1/succeed/env-warning/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/env-warning/metadata rename to tests/data/ctf-traces/1/succeed/env-warning/metadata diff --git a/tests/data/ctf-traces/succeed/ev-disc-no-ts-begin-end/metadata b/tests/data/ctf-traces/1/succeed/ev-disc-no-ts-begin-end/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/ev-disc-no-ts-begin-end/metadata rename to tests/data/ctf-traces/1/succeed/ev-disc-no-ts-begin-end/metadata diff --git a/tests/data/ctf-traces/succeed/ev-disc-no-ts-begin-end/stream b/tests/data/ctf-traces/1/succeed/ev-disc-no-ts-begin-end/stream similarity index 100% rename from tests/data/ctf-traces/succeed/ev-disc-no-ts-begin-end/stream rename to tests/data/ctf-traces/1/succeed/ev-disc-no-ts-begin-end/stream diff --git a/tests/data/ctf-traces/succeed/lf-metadata/channel0_0 b/tests/data/ctf-traces/1/succeed/lf-metadata/channel0_0 similarity index 100% rename from tests/data/ctf-traces/succeed/lf-metadata/channel0_0 rename to tests/data/ctf-traces/1/succeed/lf-metadata/channel0_0 diff --git a/tests/data/ctf-traces/succeed/lf-metadata/metadata b/tests/data/ctf-traces/1/succeed/lf-metadata/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/lf-metadata/metadata rename to tests/data/ctf-traces/1/succeed/lf-metadata/metadata diff --git a/tests/data/ctf-traces/succeed/lttng-crash/chan_0 b/tests/data/ctf-traces/1/succeed/lttng-crash/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-crash/chan_0 rename to tests/data/ctf-traces/1/succeed/lttng-crash/chan_0 diff --git a/tests/data/ctf-traces/succeed/lttng-crash/metadata b/tests/data/ctf-traces/1/succeed/lttng-crash/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-crash/metadata rename to tests/data/ctf-traces/1/succeed/lttng-crash/metadata diff --git a/tests/data/ctf-traces/succeed/lttng-event-after-packet/chan_0 b/tests/data/ctf-traces/1/succeed/lttng-event-after-packet/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-event-after-packet/chan_0 rename to tests/data/ctf-traces/1/succeed/lttng-event-after-packet/chan_0 diff --git a/tests/data/ctf-traces/succeed/lttng-event-after-packet/metadata b/tests/data/ctf-traces/1/succeed/lttng-event-after-packet/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-event-after-packet/metadata rename to tests/data/ctf-traces/1/succeed/lttng-event-after-packet/metadata diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/README b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/README similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/README rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/README diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_0.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_0.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_0.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_1.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_1.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_1.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_2.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_2.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_0_2.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_0.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_0.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_0.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_1.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_1.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_1.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_2.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_2.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_1_2.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_0.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_0.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_0.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_1.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_1.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_1.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_2.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_2.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_2_2.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_0.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_0.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_0.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_1.idx b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_1.idx rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/index/mychan_3_1.idx diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/metadata b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/metadata rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/metadata diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_0_0 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_0_0 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_0_0 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_0_0 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_0_1 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_0_1 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_0_1 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_0_1 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_0_2 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_0_2 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_0_2 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_0_2 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_1_0 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_1_0 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_1_0 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_1_0 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_1_1 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_1_1 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_1_1 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_1_1 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_1_2 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_1_2 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_1_2 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_1_2 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_2_0 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_2_0 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_2_0 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_2_0 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_2_1 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_2_1 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_2_1 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_2_1 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_2_2 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_2_2 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_2_2 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_2_2 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_3_0 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_3_0 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_3_0 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_3_0 diff --git a/tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_3_1 b/tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_3_1 similarity index 100% rename from tests/data/ctf-traces/succeed/lttng-tracefile-rotation/kernel/mychan_3_1 rename to tests/data/ctf-traces/1/succeed/lttng-tracefile-rotation/kernel/mychan_3_1 diff --git a/tests/data/ctf-traces/succeed/meta-ctx-sequence/metadata b/tests/data/ctf-traces/1/succeed/meta-ctx-sequence/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/meta-ctx-sequence/metadata rename to tests/data/ctf-traces/1/succeed/meta-ctx-sequence/metadata diff --git a/tests/data/ctf-traces/succeed/meta-ctx-sequence/stream b/tests/data/ctf-traces/1/succeed/meta-ctx-sequence/stream similarity index 100% rename from tests/data/ctf-traces/succeed/meta-ctx-sequence/stream rename to tests/data/ctf-traces/1/succeed/meta-ctx-sequence/stream diff --git a/tests/data/ctf-traces/succeed/meta-variant-no-underscore/metadata b/tests/data/ctf-traces/1/succeed/meta-variant-no-underscore/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-no-underscore/metadata rename to tests/data/ctf-traces/1/succeed/meta-variant-no-underscore/metadata diff --git a/tests/data/ctf-traces/succeed/meta-variant-no-underscore/stream b/tests/data/ctf-traces/1/succeed/meta-variant-no-underscore/stream similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-no-underscore/stream rename to tests/data/ctf-traces/1/succeed/meta-variant-no-underscore/stream diff --git a/tests/data/ctf-traces/succeed/meta-variant-one-underscore/metadata b/tests/data/ctf-traces/1/succeed/meta-variant-one-underscore/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-one-underscore/metadata rename to tests/data/ctf-traces/1/succeed/meta-variant-one-underscore/metadata diff --git a/tests/data/ctf-traces/succeed/meta-variant-one-underscore/stream b/tests/data/ctf-traces/1/succeed/meta-variant-one-underscore/stream similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-one-underscore/stream rename to tests/data/ctf-traces/1/succeed/meta-variant-one-underscore/stream diff --git a/tests/data/ctf-traces/succeed/meta-variant-reserved-keywords/metadata b/tests/data/ctf-traces/1/succeed/meta-variant-reserved-keywords/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-reserved-keywords/metadata rename to tests/data/ctf-traces/1/succeed/meta-variant-reserved-keywords/metadata diff --git a/tests/data/ctf-traces/succeed/meta-variant-reserved-keywords/stream b/tests/data/ctf-traces/1/succeed/meta-variant-reserved-keywords/stream similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-reserved-keywords/stream rename to tests/data/ctf-traces/1/succeed/meta-variant-reserved-keywords/stream diff --git a/tests/data/ctf-traces/succeed/meta-variant-same-with-underscore/metadata b/tests/data/ctf-traces/1/succeed/meta-variant-same-with-underscore/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-same-with-underscore/metadata rename to tests/data/ctf-traces/1/succeed/meta-variant-same-with-underscore/metadata diff --git a/tests/data/ctf-traces/succeed/meta-variant-same-with-underscore/stream b/tests/data/ctf-traces/1/succeed/meta-variant-same-with-underscore/stream similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-same-with-underscore/stream rename to tests/data/ctf-traces/1/succeed/meta-variant-same-with-underscore/stream diff --git a/tests/data/ctf-traces/succeed/meta-variant-two-underscores/metadata b/tests/data/ctf-traces/1/succeed/meta-variant-two-underscores/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-two-underscores/metadata rename to tests/data/ctf-traces/1/succeed/meta-variant-two-underscores/metadata diff --git a/tests/data/ctf-traces/succeed/meta-variant-two-underscores/stream b/tests/data/ctf-traces/1/succeed/meta-variant-two-underscores/stream similarity index 100% rename from tests/data/ctf-traces/succeed/meta-variant-two-underscores/stream rename to tests/data/ctf-traces/1/succeed/meta-variant-two-underscores/stream diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/index/kernel_channel_0.idx b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/index/kernel_channel_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/index/kernel_channel_0.idx rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/index/kernel_channel_0.idx diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/index/kernel_channel_1.idx b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/index/kernel_channel_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/index/kernel_channel_1.idx rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/index/kernel_channel_1.idx diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/index/kernel_channel_2.idx b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/index/kernel_channel_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/index/kernel_channel_2.idx rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/index/kernel_channel_2.idx diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/index/kernel_channel_3.idx b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/index/kernel_channel_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/index/kernel_channel_3.idx rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/index/kernel_channel_3.idx diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/kernel_channel_0 b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/kernel_channel_0 similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/kernel_channel_0 rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/kernel_channel_0 diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/kernel_channel_1 b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/kernel_channel_1 similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/kernel_channel_1 rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/kernel_channel_1 diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/kernel_channel_2 b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/kernel_channel_2 similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/kernel_channel_2 rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/kernel_channel_2 diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/kernel_channel_3 b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/kernel_channel_3 similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/kernel_channel_3 rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/kernel_channel_3 diff --git a/tests/data/ctf-traces/succeed/multi-domains/kernel/metadata b/tests/data/ctf-traces/1/succeed/multi-domains/kernel/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/kernel/metadata rename to tests/data/ctf-traces/1/succeed/multi-domains/kernel/metadata diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/index/ust2_channel_0.idx b/tests/data/ctf-traces/1/succeed/multi-domains/ust/index/ust2_channel_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/index/ust2_channel_0.idx rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/index/ust2_channel_0.idx diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/index/ust2_channel_1.idx b/tests/data/ctf-traces/1/succeed/multi-domains/ust/index/ust2_channel_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/index/ust2_channel_1.idx rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/index/ust2_channel_1.idx diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/index/ust2_channel_2.idx b/tests/data/ctf-traces/1/succeed/multi-domains/ust/index/ust2_channel_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/index/ust2_channel_2.idx rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/index/ust2_channel_2.idx diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/index/ust2_channel_3.idx b/tests/data/ctf-traces/1/succeed/multi-domains/ust/index/ust2_channel_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/index/ust2_channel_3.idx rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/index/ust2_channel_3.idx diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/metadata b/tests/data/ctf-traces/1/succeed/multi-domains/ust/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/metadata rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/metadata diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/ust2_channel_0 b/tests/data/ctf-traces/1/succeed/multi-domains/ust/ust2_channel_0 similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/ust2_channel_0 rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/ust2_channel_0 diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/ust2_channel_1 b/tests/data/ctf-traces/1/succeed/multi-domains/ust/ust2_channel_1 similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/ust2_channel_1 rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/ust2_channel_1 diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/ust2_channel_2 b/tests/data/ctf-traces/1/succeed/multi-domains/ust/ust2_channel_2 similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/ust2_channel_2 rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/ust2_channel_2 diff --git a/tests/data/ctf-traces/succeed/multi-domains/ust/ust2_channel_3 b/tests/data/ctf-traces/1/succeed/multi-domains/ust/ust2_channel_3 similarity index 100% rename from tests/data/ctf-traces/succeed/multi-domains/ust/ust2_channel_3 rename to tests/data/ctf-traces/1/succeed/multi-domains/ust/ust2_channel_3 diff --git a/tests/data/ctf-traces/succeed/no-packet-context/metadata b/tests/data/ctf-traces/1/succeed/no-packet-context/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/no-packet-context/metadata rename to tests/data/ctf-traces/1/succeed/no-packet-context/metadata diff --git a/tests/data/ctf-traces/succeed/no-packet-context/stream b/tests/data/ctf-traces/1/succeed/no-packet-context/stream similarity index 100% rename from tests/data/ctf-traces/succeed/no-packet-context/stream rename to tests/data/ctf-traces/1/succeed/no-packet-context/stream diff --git a/tests/data/ctf-traces/succeed/sequence/channel0_0 b/tests/data/ctf-traces/1/succeed/sequence/channel0_0 similarity index 100% rename from tests/data/ctf-traces/succeed/sequence/channel0_0 rename to tests/data/ctf-traces/1/succeed/sequence/channel0_0 diff --git a/tests/data/ctf-traces/succeed/sequence/channel0_1 b/tests/data/ctf-traces/1/succeed/sequence/channel0_1 similarity index 100% rename from tests/data/ctf-traces/succeed/sequence/channel0_1 rename to tests/data/ctf-traces/1/succeed/sequence/channel0_1 diff --git a/tests/data/ctf-traces/succeed/sequence/channel0_2 b/tests/data/ctf-traces/1/succeed/sequence/channel0_2 similarity index 100% rename from tests/data/ctf-traces/succeed/sequence/channel0_2 rename to tests/data/ctf-traces/1/succeed/sequence/channel0_2 diff --git a/tests/data/ctf-traces/succeed/sequence/channel0_3 b/tests/data/ctf-traces/1/succeed/sequence/channel0_3 similarity index 100% rename from tests/data/ctf-traces/succeed/sequence/channel0_3 rename to tests/data/ctf-traces/1/succeed/sequence/channel0_3 diff --git a/tests/data/ctf-traces/succeed/sequence/metadata b/tests/data/ctf-traces/1/succeed/sequence/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/sequence/metadata rename to tests/data/ctf-traces/1/succeed/sequence/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_0 b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_0 rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_1 b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_1 rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_2 b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_2 rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_3 b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/chan_3 rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_0.idx b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_0.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_1.idx b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_1.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_2.idx b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_2.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_3.idx b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/index/chan_3.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/metadata b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10352/metadata rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10352/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_0 b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_0 rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_1 b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_1 rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_2 b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_2 rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_3 b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/chan_3 rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_0.idx b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_0.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_1.idx b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_1.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_2.idx b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_2.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_3.idx b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/index/chan_3.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/metadata b/tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/3/ust/pid/10353/metadata rename to tests/data/ctf-traces/1/succeed/session-rotation/3/ust/pid/10353/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_0 b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_0 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_1 b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_1 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_2 b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_2 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_3 b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/chan_3 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_0.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_0.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_1.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_1.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_2.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_2.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_3.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/index/chan_3.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/metadata b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10352/metadata rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10352/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_0 b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_0 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_1 b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_1 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_2 b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_2 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_3 b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/chan_3 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_0.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_0.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_1.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_1.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_2.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_2.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_3.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/index/chan_3.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/metadata b/tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/1/ust/pid/10353/metadata rename to tests/data/ctf-traces/1/succeed/session-rotation/a/1/ust/pid/10353/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_0 b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_0 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_1 b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_1 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_2 b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_2 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_3 b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/chan_3 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_0.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_0.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_1.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_1.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_2.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_2.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_3.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/index/chan_3.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/metadata b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10352/metadata rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10352/metadata diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_0 b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/chan_0 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_0 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/chan_0 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_1 b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/chan_1 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_1 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/chan_1 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_2 b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/chan_2 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_2 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/chan_2 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_3 b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/chan_3 similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/chan_3 rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/chan_3 diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_0.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/index/chan_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_0.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/index/chan_0.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_1.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/index/chan_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_1.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/index/chan_1.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_2.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/index/chan_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_2.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/index/chan_2.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_3.idx b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/index/chan_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/index/chan_3.idx rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/index/chan_3.idx diff --git a/tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/metadata b/tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/session-rotation/a/2/ust/pid/10353/metadata rename to tests/data/ctf-traces/1/succeed/session-rotation/a/2/ust/pid/10353/metadata diff --git a/tests/data/ctf-traces/succeed/smalltrace/dummystream b/tests/data/ctf-traces/1/succeed/smalltrace/dummystream similarity index 100% rename from tests/data/ctf-traces/succeed/smalltrace/dummystream rename to tests/data/ctf-traces/1/succeed/smalltrace/dummystream diff --git a/tests/data/ctf-traces/succeed/smalltrace/metadata b/tests/data/ctf-traces/1/succeed/smalltrace/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/smalltrace/metadata rename to tests/data/ctf-traces/1/succeed/smalltrace/metadata diff --git a/tests/data/ctf-traces/succeed/struct-array-align-elem/metadata b/tests/data/ctf-traces/1/succeed/struct-array-align-elem/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/struct-array-align-elem/metadata rename to tests/data/ctf-traces/1/succeed/struct-array-align-elem/metadata diff --git a/tests/data/ctf-traces/succeed/struct-array-align-elem/stream b/tests/data/ctf-traces/1/succeed/struct-array-align-elem/stream similarity index 100% rename from tests/data/ctf-traces/succeed/struct-array-align-elem/stream rename to tests/data/ctf-traces/1/succeed/struct-array-align-elem/stream diff --git a/tests/data/ctf-traces/succeed/succeed1/dummystream b/tests/data/ctf-traces/1/succeed/succeed1/dummystream similarity index 100% rename from tests/data/ctf-traces/succeed/succeed1/dummystream rename to tests/data/ctf-traces/1/succeed/succeed1/dummystream diff --git a/tests/data/ctf-traces/succeed/succeed1/metadata b/tests/data/ctf-traces/1/succeed/succeed1/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/succeed1/metadata rename to tests/data/ctf-traces/1/succeed/succeed1/metadata diff --git a/tests/data/ctf-traces/succeed/succeed2/dummystream b/tests/data/ctf-traces/1/succeed/succeed2/dummystream similarity index 100% rename from tests/data/ctf-traces/succeed/succeed2/dummystream rename to tests/data/ctf-traces/1/succeed/succeed2/dummystream diff --git a/tests/data/ctf-traces/succeed/succeed2/metadata b/tests/data/ctf-traces/1/succeed/succeed2/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/succeed2/metadata rename to tests/data/ctf-traces/1/succeed/succeed2/metadata diff --git a/tests/data/ctf-traces/succeed/succeed3/dummystream b/tests/data/ctf-traces/1/succeed/succeed3/dummystream similarity index 100% rename from tests/data/ctf-traces/succeed/succeed3/dummystream rename to tests/data/ctf-traces/1/succeed/succeed3/dummystream diff --git a/tests/data/ctf-traces/succeed/succeed3/metadata b/tests/data/ctf-traces/1/succeed/succeed3/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/succeed3/metadata rename to tests/data/ctf-traces/1/succeed/succeed3/metadata diff --git a/tests/data/ctf-traces/succeed/succeed4/metadata b/tests/data/ctf-traces/1/succeed/succeed4/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/succeed4/metadata rename to tests/data/ctf-traces/1/succeed/succeed4/metadata diff --git a/tests/data/ctf-traces/succeed/trace-with-index/index/ust_channel_0.idx b/tests/data/ctf-traces/1/succeed/trace-with-index/index/ust_channel_0.idx similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/index/ust_channel_0.idx rename to tests/data/ctf-traces/1/succeed/trace-with-index/index/ust_channel_0.idx diff --git a/tests/data/ctf-traces/succeed/trace-with-index/index/ust_channel_1.idx b/tests/data/ctf-traces/1/succeed/trace-with-index/index/ust_channel_1.idx similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/index/ust_channel_1.idx rename to tests/data/ctf-traces/1/succeed/trace-with-index/index/ust_channel_1.idx diff --git a/tests/data/ctf-traces/succeed/trace-with-index/index/ust_channel_2.idx b/tests/data/ctf-traces/1/succeed/trace-with-index/index/ust_channel_2.idx similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/index/ust_channel_2.idx rename to tests/data/ctf-traces/1/succeed/trace-with-index/index/ust_channel_2.idx diff --git a/tests/data/ctf-traces/succeed/trace-with-index/index/ust_channel_3.idx b/tests/data/ctf-traces/1/succeed/trace-with-index/index/ust_channel_3.idx similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/index/ust_channel_3.idx rename to tests/data/ctf-traces/1/succeed/trace-with-index/index/ust_channel_3.idx diff --git a/tests/data/ctf-traces/succeed/trace-with-index/metadata b/tests/data/ctf-traces/1/succeed/trace-with-index/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/metadata rename to tests/data/ctf-traces/1/succeed/trace-with-index/metadata diff --git a/tests/data/ctf-traces/succeed/trace-with-index/ust_channel_0 b/tests/data/ctf-traces/1/succeed/trace-with-index/ust_channel_0 similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/ust_channel_0 rename to tests/data/ctf-traces/1/succeed/trace-with-index/ust_channel_0 diff --git a/tests/data/ctf-traces/succeed/trace-with-index/ust_channel_1 b/tests/data/ctf-traces/1/succeed/trace-with-index/ust_channel_1 similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/ust_channel_1 rename to tests/data/ctf-traces/1/succeed/trace-with-index/ust_channel_1 diff --git a/tests/data/ctf-traces/succeed/trace-with-index/ust_channel_2 b/tests/data/ctf-traces/1/succeed/trace-with-index/ust_channel_2 similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/ust_channel_2 rename to tests/data/ctf-traces/1/succeed/trace-with-index/ust_channel_2 diff --git a/tests/data/ctf-traces/succeed/trace-with-index/ust_channel_3 b/tests/data/ctf-traces/1/succeed/trace-with-index/ust_channel_3 similarity index 100% rename from tests/data/ctf-traces/succeed/trace-with-index/ust_channel_3 rename to tests/data/ctf-traces/1/succeed/trace-with-index/ust_channel_3 diff --git a/tests/data/ctf-traces/succeed/warnings/dummystream b/tests/data/ctf-traces/1/succeed/warnings/dummystream similarity index 100% rename from tests/data/ctf-traces/succeed/warnings/dummystream rename to tests/data/ctf-traces/1/succeed/warnings/dummystream diff --git a/tests/data/ctf-traces/succeed/warnings/metadata b/tests/data/ctf-traces/1/succeed/warnings/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/warnings/metadata rename to tests/data/ctf-traces/1/succeed/warnings/metadata diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/metadata b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/metadata similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/metadata rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/metadata diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_0 b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_0 similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/u_0 rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_0 diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_1 b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_1 similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/u_1 rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_1 diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_2 b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_2 similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/u_2 rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_2 diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_3 b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_3 similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/u_3 rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_3 diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_4 b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_4 similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/u_4 rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_4 diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_5 b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_5 similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/u_5 rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_5 diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_6 b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_6 similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/u_6 rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_6 diff --git a/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_7 b/tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_7 similarity index 100% rename from tests/data/ctf-traces/succeed/wk-heartbeat-u/u_7 rename to tests/data/ctf-traces/1/succeed/wk-heartbeat-u/u_7 diff --git a/tests/data/plugins/flt.lttng-utils.debug-info/README.md b/tests/data/plugins/flt.lttng-utils.debug-info/README.md index 38045d16..91176730 100644 --- a/tests/data/plugins/flt.lttng-utils.debug-info/README.md +++ b/tests/data/plugins/flt.lttng-utils.debug-info/README.md @@ -66,10 +66,10 @@ To regenerate them, you can use the included Makefile or follow these steps: Test program ------------ -The trace provided in `tests/data/ctf-traces/succeed/debug-info/` was generated -using lttng-ust in a LTTng session configured to contain only the bare minimum -to do the debug-info resolution. You can generate such trace by following these -steps: +The trace provided in `tests/data/ctf-traces/1/succeed/debug-info/` was +generated using lttng-ust in a LTTng session configured to contain only the +bare minimum to do the debug-info resolution. You can generate such trace by +following these steps: 1. Compile the example binary: $ ln -s x86-64-linux-gnu/dwarf-full/libhello-so libhello.so diff --git a/tests/data/plugins/src.ctf.lttng-live/base.json b/tests/data/plugins/src.ctf.lttng-live/base.json index 967645b5..0062b49a 100644 --- a/tests/data/plugins/src.ctf.lttng-live/base.json +++ b/tests/data/plugins/src.ctf.lttng-live/base.json @@ -7,7 +7,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/trace-with-index/" + "path": "1/succeed/trace-with-index/" } ] } diff --git a/tests/data/plugins/src.ctf.lttng-live/inactivity-discarded-packet.json b/tests/data/plugins/src.ctf.lttng-live/inactivity-discarded-packet.json index bec5dc9f..b2ad7c3b 100644 --- a/tests/data/plugins/src.ctf.lttng-live/inactivity-discarded-packet.json +++ b/tests/data/plugins/src.ctf.lttng-live/inactivity-discarded-packet.json @@ -7,7 +7,7 @@ "client-count": 0, "traces": [ { - "path": "packet-seq-num/7-lost-between-2-with-index/", + "path": "1/packet-seq-num/7-lost-between-2-with-index/", "beacons": { "stream_0": [ 80 ] } diff --git a/tests/data/plugins/src.ctf.lttng-live/list-sessions.json b/tests/data/plugins/src.ctf.lttng-live/list-sessions.json index 0c0091ca..9a3583ec 100644 --- a/tests/data/plugins/src.ctf.lttng-live/list-sessions.json +++ b/tests/data/plugins/src.ctf.lttng-live/list-sessions.json @@ -7,7 +7,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/multi-domains/ust/" + "path": "1/succeed/multi-domains/ust/" } ] }, @@ -19,7 +19,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/multi-domains/kernel/" + "path": "1/succeed/multi-domains/kernel/" } ] }, @@ -31,7 +31,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/trace-with-index/" + "path": "1/succeed/trace-with-index/" } ] } diff --git a/tests/data/plugins/src.ctf.lttng-live/multi-domains-inverse.json b/tests/data/plugins/src.ctf.lttng-live/multi-domains-inverse.json index 71755022..122f3821 100644 --- a/tests/data/plugins/src.ctf.lttng-live/multi-domains-inverse.json +++ b/tests/data/plugins/src.ctf.lttng-live/multi-domains-inverse.json @@ -7,7 +7,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/multi-domains/ust/" + "path": "1/succeed/multi-domains/ust/" } ] }, @@ -19,7 +19,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/multi-domains/kernel/" + "path": "1/succeed/multi-domains/kernel/" } ] } diff --git a/tests/data/plugins/src.ctf.lttng-live/multi-domains.json b/tests/data/plugins/src.ctf.lttng-live/multi-domains.json index 155cacf9..df046a5b 100644 --- a/tests/data/plugins/src.ctf.lttng-live/multi-domains.json +++ b/tests/data/plugins/src.ctf.lttng-live/multi-domains.json @@ -7,7 +7,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/multi-domains/kernel/" + "path": "1/succeed/multi-domains/kernel/" } ] }, @@ -19,7 +19,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/multi-domains/ust/" + "path": "1/succeed/multi-domains/ust/" } ] } diff --git a/tests/data/plugins/src.ctf.lttng-live/rate-limited.json b/tests/data/plugins/src.ctf.lttng-live/rate-limited.json index d7022b10..44b7eb65 100644 --- a/tests/data/plugins/src.ctf.lttng-live/rate-limited.json +++ b/tests/data/plugins/src.ctf.lttng-live/rate-limited.json @@ -7,7 +7,7 @@ "client-count": 0, "traces": [ { - "path": "succeed/trace-with-index/" + "path": "1/succeed/trace-with-index/" } ] } diff --git a/tests/data/plugins/src.ctf.lttng-live/split-metadata.json b/tests/data/plugins/src.ctf.lttng-live/split-metadata.json index 867e94d7..12968cbe 100644 --- a/tests/data/plugins/src.ctf.lttng-live/split-metadata.json +++ b/tests/data/plugins/src.ctf.lttng-live/split-metadata.json @@ -7,7 +7,7 @@ "client-count": 0, "traces": [ { - "path": "live/split-metadata/", + "path": "1/live/split-metadata/", "beacons": { }, "metadata-sections": [ diff --git a/tests/plugins/flt.lttng-utils.debug-info/test-succeed.sh b/tests/plugins/flt.lttng-utils.debug-info/test-succeed.sh index 430bab3a..053279af 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test-succeed.sh +++ b/tests/plugins/flt.lttng-utils.debug-info/test-succeed.sh @@ -9,7 +9,7 @@ # This test validates that a `src.ctf.fs` component successfully reads # specific CTF traces and creates the expected messages. # -# Such CTF traces to open either exist (in `tests/ctf-traces/succeed`) +# Such CTF traces to open either exist (in `tests/ctf-traces/1/succeed`) # or are generated by this test using local trace generators. SH_TAP=1 @@ -24,7 +24,7 @@ fi source "$UTILSSH" this_dir_relative="plugins/flt.lttng-utils.debug-info" -succeed_trace_dir="$BT_CTF_TRACES_PATH/succeed" +succeed_trace_dir="$BT_CTF_TRACES_PATH/1/succeed" expect_dir="$BT_TESTS_DATADIR/$this_dir_relative" binary_artefact_dir="$BT_TESTS_DATADIR/$this_dir_relative" data_dir="$BT_TESTS_DATADIR/$this_dir_relative" diff --git a/tests/plugins/sink.ctf.fs/succeed/test-succeed.sh b/tests/plugins/sink.ctf.fs/succeed/test-succeed.sh index 6d47c09e..16e454d0 100755 --- a/tests/plugins/sink.ctf.fs/succeed/test-succeed.sh +++ b/tests/plugins/sink.ctf.fs/succeed/test-succeed.sh @@ -8,7 +8,7 @@ # This test validates that a `src.ctf.fs` component successfully reads # specific CTF traces and creates the expected messages. # -# Such CTF traces to open either exist (in `tests/ctf-traces/succeed`) +# Such CTF traces to open either exist (in `tests/ctf-traces/1/succeed`) # or are generated by this test using local trace generators. SH_TAP=1 @@ -25,7 +25,7 @@ source "$UTILSSH" this_dir_relative="plugins/sink.ctf.fs/succeed" this_dir_build="$BT_TESTS_BUILDDIR/$this_dir_relative" expect_dir="$BT_TESTS_DATADIR/$this_dir_relative" -succeed_traces="$BT_CTF_TRACES_PATH/succeed" +succeed_traces="$BT_CTF_TRACES_PATH/1/succeed" test_ctf_single() { local name="$1" @@ -82,8 +82,8 @@ plan_tests 14 test_ctf_gen_single float test_ctf_gen_single double -test_ctf_existing_single meta-variant-no-underscore -test_ctf_existing_single meta-variant-one-underscore -test_ctf_existing_single meta-variant-reserved-keywords -test_ctf_existing_single meta-variant-same-with-underscore -test_ctf_existing_single meta-variant-two-underscores +test_ctf_existing_single "meta-variant-no-underscore" +test_ctf_existing_single "meta-variant-one-underscore" +test_ctf_existing_single "meta-variant-reserved-keywords" +test_ctf_existing_single "meta-variant-same-with-underscore" +test_ctf_existing_single "meta-variant-two-underscores" diff --git a/tests/plugins/sink.text.details/succeed/test-succeed.sh b/tests/plugins/sink.text.details/succeed/test-succeed.sh index 9c21155d..5329686f 100755 --- a/tests/plugins/sink.text.details/succeed/test-succeed.sh +++ b/tests/plugins/sink.text.details/succeed/test-succeed.sh @@ -24,7 +24,7 @@ test_details() { local trace_name="$2" shift 2 local details_args=("$@") - local trace_dir="$BT_CTF_TRACES_PATH/succeed/$trace_name" + local trace_dir="$BT_CTF_TRACES_PATH/1/succeed/$trace_name" local expect_path="$expect_dir/$test_name.expect" bt_diff_cli "$expect_path" /dev/null \ diff --git a/tests/plugins/src.ctf.fs/fail/test-fail.sh b/tests/plugins/src.ctf.fs/fail/test-fail.sh index ee0f82f7..7c5120ac 100755 --- a/tests/plugins/src.ctf.fs/fail/test-fail.sh +++ b/tests/plugins/src.ctf.fs/fail/test-fail.sh @@ -19,7 +19,7 @@ fi # shellcheck source=../../../utils/utils.sh source "$UTILSSH" -fail_trace_dir="$BT_CTF_TRACES_PATH/fail" +fail_trace_dir="$BT_CTF_TRACES_PATH/1/fail" stdout_file=$(mktemp -t test-ctf-fail-stdout.XXXXXX) stderr_file=$(mktemp -t test-ctf-fail-stderr.XXXXXX) diff --git a/tests/plugins/src.ctf.fs/query/test-query-metadata-info.sh b/tests/plugins/src.ctf.fs/query/test-query-metadata-info.sh index 14a61822..86137c9e 100755 --- a/tests/plugins/src.ctf.fs/query/test-query-metadata-info.sh +++ b/tests/plugins/src.ctf.fs/query/test-query-metadata-info.sh @@ -18,7 +18,7 @@ fi source "$UTILSSH" this_dir_relative="plugins/src.ctf.fs/query" -succeed_trace_dir="$BT_CTF_TRACES_PATH/succeed" +succeed_trace_dir="$BT_CTF_TRACES_PATH/1/succeed" expect_dir="$BT_TESTS_DATADIR/$this_dir_relative" test_query_metadata_info() { diff --git a/tests/plugins/src.ctf.fs/query/test_query_support_info.py b/tests/plugins/src.ctf.fs/query/test_query_support_info.py index 683312f5..0bc0a33a 100644 --- a/tests/plugins/src.ctf.fs/query/test_query_support_info.py +++ b/tests/plugins/src.ctf.fs/query/test_query_support_info.py @@ -9,7 +9,7 @@ import unittest import bt2 session_rotation_trace_path = os.path.join( - os.environ["BT_CTF_TRACES_PATH"], "succeed", "session-rotation" + os.environ["BT_CTF_TRACES_PATH"], "1", "succeed", "session-rotation" ) diff --git a/tests/plugins/src.ctf.fs/query/test_query_trace_info.py b/tests/plugins/src.ctf.fs/query/test_query_trace_info.py index 18a17120..1d688013 100644 --- a/tests/plugins/src.ctf.fs/query/test_query_trace_info.py +++ b/tests/plugins/src.ctf.fs/query/test_query_trace_info.py @@ -23,7 +23,7 @@ class QueryTraceInfoClockOffsetTestCase(unittest.TestCase): self._fs = ctf.source_component_classes["fs"] self._inputs = [ - os.path.join(test_ctf_traces_path, "intersection", "3eventsintersect") + os.path.join(test_ctf_traces_path, "1", "intersection", "3eventsintersect") ] def _check(self, trace, offset): @@ -127,7 +127,7 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): { "inputs": [ os.path.join( - test_ctf_traces_path, "intersection", "3eventsintersect" + test_ctf_traces_path, "1", "intersection", "3eventsintersect" ) ] }, @@ -135,10 +135,10 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): if os.environ["BT_TESTS_OS_TYPE"] == "mingw": os_stream_path = ( - "\\tests\\data\\ctf-traces\\intersection\\3eventsintersect\\" + "\\tests\\data\\ctf-traces\\1\\intersection\\3eventsintersect\\" ) else: - os_stream_path = "/tests/data/ctf-traces/intersection/3eventsintersect/" + os_stream_path = "/tests/data/ctf-traces/1/intersection/3eventsintersect/" self.assertEqual(len(res), 1) trace = res[0] @@ -161,13 +161,19 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): res = bt2.QueryExecutor( self._fs, "babeltrace.trace-infos", - {"inputs": [os.path.join(test_ctf_traces_path, "succeed", "succeed1")]}, + { + "inputs": [ + os.path.join(test_ctf_traces_path, "1", "succeed", "succeed1") + ] + }, ).query() if os.environ["BT_TESTS_OS_TYPE"] == "mingw": - os_stream_path = "\\tests\\data\\ctf-traces\\succeed\\succeed1\\dummystream" + os_stream_path = ( + "\\tests\\data\\ctf-traces\\1\\succeed\\succeed1\\dummystream" + ) else: - os_stream_path = "/tests/data/ctf-traces/succeed/succeed1/dummystream" + os_stream_path = "/tests/data/ctf-traces/1/succeed/succeed1/dummystream" self.assertEqual(len(res), 1) trace = res[0] @@ -195,7 +201,11 @@ class QueryTraceInfoRangeTestCase(unittest.TestCase): res = bt2.QueryExecutor( self._fs, "babeltrace.trace-infos", - {"inputs": [os.path.join(test_ctf_traces_path, "succeed", "succeed1")]}, + { + "inputs": [ + os.path.join(test_ctf_traces_path, "1", "succeed", "succeed1") + ] + }, ).query() self.assertEqual(len(res), 1) @@ -214,6 +224,7 @@ class QueryTraceInfoRangeTestCase(unittest.TestCase): "inputs": [ os.path.join( test_ctf_traces_path, + "1", "succeed", "lttng-tracefile-rotation", "kernel", @@ -248,7 +259,7 @@ class QueryTraceInfoPacketTimestampQuirksTestCase(unittest.TestCase): def setUp(self): ctf = bt2.find_plugin("ctf") self._fs = ctf.source_component_classes["fs"] - self._path = os.path.join(test_ctf_traces_path, "succeed") + self._path = os.path.join(test_ctf_traces_path, "1", "succeed") def _test_lttng_quirks(self, trace_name): res = bt2.QueryExecutor( diff --git a/tests/plugins/src.ctf.fs/succeed/test-succeed.sh b/tests/plugins/src.ctf.fs/succeed/test-succeed.sh index 5a00601c..b0ac4c0e 100755 --- a/tests/plugins/src.ctf.fs/succeed/test-succeed.sh +++ b/tests/plugins/src.ctf.fs/succeed/test-succeed.sh @@ -8,7 +8,7 @@ # This test validates that a `src.ctf.fs` component successfully reads # specific CTF traces and creates the expected messages. # -# Such CTF traces to open either exist (in `tests/ctf-traces/succeed`) +# Such CTF traces to open either exist (in `tests/ctf-traces/1/succeed`) # or are generated by this test using local trace generators. SH_TAP=1 @@ -24,7 +24,7 @@ source "$UTILSSH" this_dir_relative="plugins/src.ctf.fs/succeed" this_dir_build="$BT_TESTS_BUILDDIR/$this_dir_relative" -succeed_trace_dir="$BT_CTF_TRACES_PATH/succeed" +succeed_trace_dir="$BT_CTF_TRACES_PATH/1/succeed" expect_dir="$BT_TESTS_DATADIR/$this_dir_relative" test_ctf_common_details_args=("-p" "with-trace-name=no,with-stream-name=no") diff --git a/tests/plugins/src.ctf.fs/test-deterministic-ordering.sh b/tests/plugins/src.ctf.fs/test-deterministic-ordering.sh index e2cb9cd1..b9dab61c 100755 --- a/tests/plugins/src.ctf.fs/test-deterministic-ordering.sh +++ b/tests/plugins/src.ctf.fs/test-deterministic-ordering.sh @@ -37,7 +37,7 @@ fi # shellcheck source=../../utils/utils.sh source "$UTILSSH" -traces_dir="${BT_CTF_TRACES_PATH}/deterministic-ordering" +traces_dir="${BT_CTF_TRACES_PATH}/1/deterministic-ordering" trace_a_corrupted="${traces_dir}/a-corrupted" trace_b_not_corrupted="${traces_dir}/b-not-corrupted" trace_c_corrupted="${traces_dir}/c-corrupted" diff --git a/tests/plugins/src.ctf.lttng-live/test-live.sh b/tests/plugins/src.ctf.lttng-live/test-live.sh index c53132e7..e77f2711 100755 --- a/tests/plugins/src.ctf.lttng-live/test-live.sh +++ b/tests/plugins/src.ctf.lttng-live/test-live.sh @@ -303,7 +303,7 @@ test_compare_to_ctf_fs() { expected_stdout="$(mktemp -t test-live-compare-stdout-expected.XXXXXX)" expected_stderr="$(mktemp -t test-live-compare-stderr-expected.XXXXXX)" - bt_cli "$expected_stdout" "$expected_stderr" "${trace_dir}/succeed/multi-domains" -c sink.text.details --params "with-trace-name=false,with-stream-name=false" + bt_cli "$expected_stdout" "$expected_stderr" "${trace_dir}/1/succeed/multi-domains" -c sink.text.details --params "with-trace-name=false,with-stream-name=false" bt_remove_cr "${expected_stdout}" bt_remove_cr "${expected_stderr}" @@ -392,7 +392,7 @@ test_stored_values() { tmp_dir=$(mktemp -d -t 'test-stored-value.XXXXXXX') # Generate test trace. - bt_gen_mctf_trace "${trace_dir}/live/stored-values.mctf" "$tmp_dir/stored-values" + bt_gen_mctf_trace "${trace_dir}/1/live/stored-values.mctf" "$tmp_dir/stored-values" run_test "$test_text" "$cli_args_template" "$expected_stdout" \ "$expected_stderr" "$tmp_dir" "${server_args[@]}" @@ -414,8 +414,8 @@ test_live_new_stream_during_inactivity() { tmp_dir=$(mktemp -d -t 'test-new-streams.XXXXXXX') # Generate test trace. - bt_gen_mctf_trace "${trace_dir}/live/new-streams/first-trace.mctf" "$tmp_dir/first-trace" - bt_gen_mctf_trace "${trace_dir}/live/new-streams/second-trace.mctf" "$tmp_dir/second-trace" + bt_gen_mctf_trace "${trace_dir}/1/live/new-streams/first-trace.mctf" "$tmp_dir/first-trace" + bt_gen_mctf_trace "${trace_dir}/1/live/new-streams/second-trace.mctf" "$tmp_dir/second-trace" run_test "$test_text" "$cli_args_template" "$expected_stdout" \ "$expected_stderr" "$tmp_dir" "${server_args[@]}" -- 2.34.1