From: Jani Nikula <jani@nikula.org>
Date: Tue, 4 Dec 2012 21:26:32 +0000 (+0200)
Subject: test: wrap 'wc -l' results in arithmetic evaluation to strip whitespace
X-Git-Tag: 0.15_rc1~121
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60e79e3a9f1c8;p=notmuch.git

test: wrap 'wc -l' results in arithmetic evaluation to strip whitespace

This is for portability, as 'wc -l' emits whitespace on some BSD
variants. Suggested by Tomi Ollila <tomi.ollila@iki.fi>.
---

diff --git a/test/count b/test/count
index 8e587ff9..879b114a 100755
--- a/test/count
+++ b/test/count
@@ -4,24 +4,28 @@ test_description='"notmuch count" for messages and threads'
 
 add_email_corpus
 
+# Note: The 'wc -l' results below are wrapped in arithmetic evaluation
+# $((...)) to strip whitespace. This is for portability, as 'wc -l'
+# emits whitespace on some BSD variants.
+
 test_begin_subtest "message count is the default for notmuch count"
 test_expect_equal \
-    "`notmuch search --output=messages '*' | wc -l`" \
+    "$((`notmuch search --output=messages '*' | wc -l`))" \
     "`notmuch count '*'`"
 
 test_begin_subtest "message count with --output=messages"
 test_expect_equal \
-    "`notmuch search --output=messages '*' | wc -l`" \
+    "$((`notmuch search --output=messages '*' | wc -l`))" \
     "`notmuch count --output=messages '*'`"
 
 test_begin_subtest "thread count with --output=threads"
 test_expect_equal \
-    "`notmuch search --output=threads '*' | wc -l`" \
+    "$((`notmuch search --output=threads '*' | wc -l`))" \
     "`notmuch count --output=threads '*'`"
 
 test_begin_subtest "thread count is the default for notmuch search"
 test_expect_equal \
-    "`notmuch search '*' | wc -l`" \
+    "$((`notmuch search '*' | wc -l`))" \
     "`notmuch count --output=threads '*'`"
 
 test_begin_subtest "count with no matching messages"