tests: Move data files to a common directory

[babeltrace.git] / tests / cli / test_trimmer.in

diff --git a/tests/cli/test_trimmer.in b/tests/cli/test_trimmer.in
index 6918cdad10c33b32cee8c2482a8c29b2f8ab2dbc..f40ab44476c975aa13278b408cc56403308ed3c1 100644 (file)
--- a/tests/cli/test_trimmer.in
+++ b/tests/cli/test_trimmer.in
@@ -17,7 +17,7 @@
 
 . "@abs_top_builddir@/tests/utils/common.sh"
 
-TRACE_PATH="${BT_CTF_TRACES}/succeed/wk-heartbeat-u/"
+TRACE_PATH="${BT_CTF_TRACES_PATH}/succeed/wk-heartbeat-u/"
 
 NUM_TESTS=40
 
@@ -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" \