From: Jérémie Galarneau Date: Wed, 8 Nov 2017 19:02:07 +0000 (-0500) Subject: Tests fix: BT2 does not output the metadata of a trace collection X-Git-Tag: v2.11.0-rc1~450 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3d2deeadbdbcc9ef645701da46172de93d2ed45b;p=lttng-tools.git Tests fix: BT2 does not output the metadata of a trace collection Signed-off-by: Jérémie Galarneau --- diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override index 2f64bd929..e19b77e1d 100755 --- 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 77fa91216..d63ec8bcb 100755 --- 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