Tests fix: BT2 does not output the metadata of a trace collection

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override
index 2f64bd92943ba1d1c0c4b7fd68f9160e9e8ddfdc..e19b77e1dc08868281ce7969e497032f223006e7 100755 (executable)
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -98,7 +98,10 @@ function test_clock_override_metadata()
        rmmod lttng-clock-plugin-test
        rmmod lttng-clock
 
-       $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_PATH
+       local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
+       local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"
+
+       $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_METADATA_DIR
        ok $? "Metadata extraction from babeltrace"
 
        extract_clock_metadata $ctf_metadata_file $clock_metadata_file

diff --git a/tests/regression/ust/clock-override/test_clock_override b/tests/regression/ust/clock-override/test_clock_override
index 77fa91216fa30644adbabaf4686c5907753c0924..d63ec8bcb573d1695fb0f3faaec3bd264133b4a6 100755 (executable)
--- a/tests/regression/ust/clock-override/test_clock_override
+++ b/tests/regression/ust/clock-override/test_clock_override
@@ -95,7 +95,10 @@ function test_getcpu_override_metadata()
        destroy_lttng_session_ok $SESSION_NAME
        stop_lttng_sessiond
 
-       $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_PATH
+       local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
+       local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"
+
+       $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_METADATA_DIR
        ok $? "Metadata extraction from babeltrace"
 
        extract_clock_metadata $ctf_metadata_file $clock_metadata_file