X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=tests%2Fcli%2Ftest_trimmer;h=c40db035c370fbb26269614c9a15c075f9799952;hb=b198ef8159e337c13c0d7685e512717fd55ac1c3;hp=a3246b2cbeb5436e975ce480e01f2e7ea77c5943;hpb=d4d7ffc9b2ac45125334268754c11c4a57c7de66;p=babeltrace.git

diff --git a/tests/cli/test_trimmer b/tests/cli/test_trimmer
index a3246b2c..c40db035 100755
--- a/tests/cli/test_trimmer
+++ b/tests/cli/test_trimmer
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
+# Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
 #
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 SH_TAP=1
 
@@ -51,7 +41,7 @@ function expect_success()
 	local msg="$2"
 	shift 2
 
-	"${BT_TESTS_BT2_BIN}" "${TRACE_PATH}" "$@" 2>/dev/null > "${tmp_out}"
+	bt_cli "${tmp_out}" /dev/null "${TRACE_PATH}" "$@"
 	ok $? "trimmer: ${msg}: exit status"
 
 	num_events=$(wc -l < "${tmp_out}")
@@ -76,11 +66,12 @@ function expect_failure()
 
 	# We check the error message logged by the trimmer plugin, set the env
 	# var necessary for it to log errors.
-	BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL=E "${BT_TESTS_BT2_BIN}" "${TRACE_PATH}" "$@" 2> "${tmp_err}" > "${tmp_out}"
+	BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL=E bt_cli "${tmp_out}" "${tmp_err}" "${TRACE_PATH}" "$@"
 	isnt $? 0 "trimmer: ${msg}: exit status"
 
 	num_events=$(wc -l < "${tmp_out}")
-	is "${num_events}" 0 "trimmer: ${msg}: number of events (0)"
+	# Use bash parameter expansion to strip spaces added by BSD 'wc' on macOs and Solaris
+	is "${num_events// /}" 0 "trimmer: ${msg}: number of events (0)"
 
 	stderr="$(cat "${tmp_err}")"
 	# "like" doesn't like when the passed text is empty.
@@ -115,7 +106,18 @@ expect_success 0 "--begin, out of range, GMT absolute timestamps" \
 expect_success 0 "--begin, out of range, GMT absolute timestamps" \
 	--clock-gmt --end "2012-10-29 16:48:17.588680018"
 
-export TZ=EST
+# Note here that the POSIX notation is a bit weird.
+# The libc documentation shed some light on this:
+#  The offset specifies the time value you must add to the local time to get a
+#  Coordinated Universal Time value. It has syntax like [+|-]hh[:mm[:ss]]. This
+#  is positive if the local time zone is west of the Prime Meridian and negative
+#  if it is east. The hour must be between 0 and 24, and the minute and seconds
+#  between 0 and 59. [1]
+#
+# This is why we use EST5 to simulate an effective UTC-5:00 time.
+#
+# [1] https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
+export TZ=EST5
 
 expect_success 18 "--begin, EST relative timestamps" \
 	--begin "12:48:17.587029529"