[PATCH 2/3] test: wrap 'wc -l' results in arithmetic evaluation to strip whitespace

Jani Nikula jani at nikula.org
Tue Dec 4 13:26:32 PST 2012


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

---

Updated version of id:1338361324-57289-8-git-send-email-pioto at pioto.org
---
 test/count |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/count b/test/count
index 8e587ff..879b114 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"
-- 
1.7.10.4



More information about the notmuch mailing list