From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 21 Aug 2017 19:24:36 +0000 (-0400)
Subject: Port: don't quote wc output in test scripts
X-Git-Tag: v2.0.0-pre4~105
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=3119de00eed0eeb9ddf80f93c4b8f0ba80f97a2f

Port: don't quote wc output in test scripts

The 'wc' command on macOS prefixes the count it returns with spaces, if
we quote the output it won't be properly converted to integer for the
comparison.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/cli/test_trace_copy.in b/tests/cli/test_trace_copy.in
index 5d1e7b45..41be44c1 100644
--- a/tests/cli/test_trace_copy.in
+++ b/tests/cli/test_trace_copy.in
@@ -38,7 +38,7 @@ for path in "${SUCCESS_TRACES[@]}"; do
 	"${BT_BIN}" --no-delta "${path}" 2>/dev/null >"${text_output1}"
 	ret=$?
 	cnt="$(wc -l < "${text_output1}")"
-	if test "$ret" == 0 && test "$cnt" == 0; then
+	if test "$ret" == 0 && test $cnt == 0; then
 		pass "Empty trace ${trace}, nothing to copy"
 		clean_tmp
 		continue
@@ -54,7 +54,7 @@ for path in "${SUCCESS_TRACES[@]}"; do
 		# Extract only the timestamp columns and compare the number of
 		# unique lines with the total number of lines to see if there
 		# are duplicate timestamps.
-		if test "$cnt" != "$uniq_ts_cnt"; then
+		if test $cnt != $uniq_ts_cnt; then
 			diag "Trace with non unique timestamps, sorting the output"
 			sort_cmd="sort"
 			tmp="$(mktemp)"
@@ -72,7 +72,7 @@ for path in "${SUCCESS_TRACES[@]}"; do
 
 	"${BT_BIN}" --no-delta "${out_path}" 2>/dev/null | $sort_cmd >"${text_output2}"
 	cnt=$(diff "${text_output1}" "${text_output2}" | wc -l)
-	test "$cnt" == 0
+	test $cnt == 0
 	ok $? "Exact same content between the two traces"
 
 	clean_tmp
diff --git a/tests/cli/test_trimmer.in b/tests/cli/test_trimmer.in
index 9303cdf7..03777af5 100644
--- a/tests/cli/test_trimmer.in
+++ b/tests/cli/test_trimmer.in
@@ -33,34 +33,34 @@ ok $? "Read the trace with the trimmer enabled"
 	2>/dev/null >"${tmp_out}"
 ok $? "Running with --begin"
 cnt=$(wc -l < "${tmp_out}")
-test "$cnt" == 18
+test $cnt == 18
 ok $? "Expected number of events after trimming begin and end"
 
 "${BT_BIN}" --clock-gmt --end 17:48:17.588680018 "${TRACE_PATH}" \
 	2>/dev/null >"${tmp_out}"
 ok $? "Running with --end"
 cnt=$(wc -l < "${tmp_out}")
-test "$cnt" == 9
+test $cnt == 9
 ok $? "Expected number of events after trimming end"
 
 "${BT_BIN}" --clock-gmt --begin 17:48:17.587029529 --end 17:48:17.588680018 \
 	"${TRACE_PATH}" 2>/dev/null >"${tmp_out}"
 ok $? "Running with --begin and --end"
 cnt=$(wc -l < "${tmp_out}")
-test "$cnt" == 7
+test $cnt == 7
 ok $? "Expected number of events after trimming begin and end"
 
 "${BT_BIN}" --clock-gmt --begin 18:48:17.587029529 "${TRACE_PATH}" \
 	2>/dev/null >"${tmp_out}"
 ok $? "Running with --begin out of range"
 cnt=$(wc -l < "${tmp_out}")
-test "$cnt" == 0
+test $cnt == 0
 ok $? "No event output when begin is after the end of the trace"
 
 "${BT_BIN}" --clock-gmt --end 16:48:17.588680018 "${TRACE_PATH}" \
 	2>/dev/null >"${tmp_out}"
 cnt=$(wc -l < "${tmp_out}")
-test "$cnt" == 0
+test $cnt == 0
 ok $? "No event output when end is before the beginning of the trace"
 
 rm "${tmp_out}"