From 891c35e417a23d70b5e5bfd4e52b4179c74afb0f Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 17 Jun 2019 12:10:34 -0400 Subject: [PATCH] fix: test_trimmer on macOs and Solaris The 'wc' tool on BSD based system adds leading spaces to it's output, which breaks the quoted compare. Use bash parameter expansion to trim all spaces from the 'num_events' variable. Signed-off-by: Michael Jeanson Change-Id: I15aef8c6987e40bcb018f32c7c094eabbc3d83c3 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1476 Reviewed-by: Simon Marchi Reviewed-by: Philippe Proulx Tested-by: jenkins --- tests/cli/test_trimmer.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/cli/test_trimmer.in b/tests/cli/test_trimmer.in index 6918cdad..8c853aea 100644 --- a/tests/cli/test_trimmer.in +++ b/tests/cli/test_trimmer.in @@ -44,7 +44,8 @@ function expect_success() "${BT_BIN}" "${TRACE_PATH}" "$@" 2>/dev/null > "${tmp_out}" ok $? "trimmer: ${msg}: exit status" num_events=$(wc -l < "${tmp_out}") - is "${num_events}" "${expected_num_events}" "trimmer: ${msg}: number of events (${expected_num_events})" + # Use bash parameter expansion to strip spaces added by BSD 'wc' on macOs and Solaris + is "${num_events// /}" "${expected_num_events}" "trimmer: ${msg}: number of events (${expected_num_events})" } expect_success 18 "--begin, GMT relative timestamps" \ -- 2.34.1