From 909f16f5231aa93488f290dc9b14ae4c209e440e Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Mon, 15 Aug 2022 11:04:19 -0400
Subject: [PATCH] tests: add clock-class before trace-class CTF2 test

Add a test with a CTF 2 metadata file where a clock-class fragment is
before the trace-class fragment.  A bug triggered by this patch was hit
during development.

Change-Id: If9fd2497ca31ad73d9db1198f90e2404d9a7a8c1
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12752
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
 .../meta-clk-cls-before-trace-cls/metadata    | 19 ++++++++++++++
 ...trace-meta-clk-cls-before-trace-cls.expect |  0
 .../src.ctf.fs/succeed/test-succeed.sh        | 25 ++++++++++++-------
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 tests/data/ctf-traces/2/succeed/meta-clk-cls-before-trace-cls/metadata
 create mode 100644 tests/data/plugins/src.ctf.fs/succeed/trace-meta-clk-cls-before-trace-cls.expect

diff --git a/tests/data/ctf-traces/2/succeed/meta-clk-cls-before-trace-cls/metadata b/tests/data/ctf-traces/2/succeed/meta-clk-cls-before-trace-cls/metadata
new file mode 100644
index 00000000..27592b5c
--- /dev/null
+++ b/tests/data/ctf-traces/2/succeed/meta-clk-cls-before-trace-cls/metadata
@@ -0,0 +1,19 @@
+
+{
+  "type": "preamble",
+  "version": 2
+}
+
+{
+  "type": "clock-class",
+  "frequency": 1000000000,
+  "id": "monotonic"
+}
+
+{
+  "type": "trace-class"
+}
+
+{
+  "type": "data-stream-class"
+}
diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-meta-clk-cls-before-trace-cls.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-meta-clk-cls-before-trace-cls.expect
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/plugins/src.ctf.fs/succeed/test-succeed.sh b/tests/plugins/src.ctf.fs/succeed/test-succeed.sh
index 6402533b..7b0960cd 100755
--- a/tests/plugins/src.ctf.fs/succeed/test-succeed.sh
+++ b/tests/plugins/src.ctf.fs/succeed/test-succeed.sh
@@ -45,18 +45,24 @@ test_ctf_gen_single() {
 	ok $? "Generated trace '$name' gives the expected output"
 }
 
-test_ctf_single() {
+# Parameters: <trace-name> <ctf-version>
+test_ctf_single_version() {
 	local name="$1"
+	local ctf_version="$2"
+	local trace_path
 
-	for ctf_version in 1 2; do
-		local trace_path
+	trace_path=$(succeed_trace_path "$name" "$ctf_version")
+
+	bt_diff_details_ctf_single "$expect_dir/trace-$name.expect" \
+		"$trace_path" "${test_ctf_common_details_args[@]}"
+	ok $? "Trace '$name' gives the expected output - CTF $ctf_version"
+}
 
-		trace_path=$(succeed_trace_path "$name" "$ctf_version")
+test_ctf_single() {
+	local name="$1"
 
-		bt_diff_details_ctf_single "$expect_dir/trace-$name.expect" \
-			"$trace_path" "${test_ctf_common_details_args[@]}"
-		ok $? "Trace '$name' gives the expected output - CTF $ctf_version"
-	done
+	test_ctf_single_version "$name" 1
+	test_ctf_single_version "$name" 2
 }
 
 test_packet_end() {
@@ -141,7 +147,7 @@ test_force_origin_unix_epoch() {
 	rm -f "$temp_stdout_output_file" "$temp_stderr_output_file"
 }
 
-plan_tests 23
+plan_tests 24
 
 test_force_origin_unix_epoch 2packets barectf-event-before-packet
 test_ctf_gen_single simple
@@ -153,5 +159,6 @@ test_ctf_single lttng-tracefile-rotation
 test_ctf_single array-align-elem
 test_ctf_single struct-array-align-elem
 test_ctf_single meta-ctx-sequence
+test_ctf_single_version meta-clk-cls-before-trace-cls 2
 test_packet_end lttng-event-after-packet
 test_packet_end lttng-crash
-- 
2.34.1