From: Jérémie Galarneau Date: Mon, 16 May 2022 22:49:05 +0000 (-0400) Subject: Tests fix: metadata event: print expected and actual event match count X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bade86436a3004fc696c5dc4d17607f63653b933;p=deliverable%2Flttng-tools.git Tests fix: metadata event: print expected and actual event match count The validate_metadata_event() function prints the actual event match count twice when a test fails. Printing the expected vs actual counts was probably the intention of the original author. Signed-off-by: Jérémie Galarneau Change-Id: Ideac2593a5d4d239ee24f98f954dddf2b5be91fa --- diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index b8b9a6b49..2752b0f7a 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -1921,10 +1921,10 @@ function validate_metadata_event () local count=$($BABELTRACE_BIN --output-format=ctf-metadata $metadata_path | grep $event_name | wc -l) if [ "$count" -ne "$nr_event_id" ]; then - fail "Metadata match with the metadata of $count event(s) named $event_name" - diag "$count matching event id found in metadata" + fail "Metadata match with the metadata of $nr_event_id event(s) named $event_name" + diag "$count matching event names found in metadata" else - pass "Metadata match with the metadata of $count event(s) named $event_name" + pass "Metadata match with the metadata of $nr_event_id event(s) named $event_name" fi }