1 Return-Path: <jani@nikula.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 6F4B4431FAE
\r
6 for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 13:26:57 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id ysbysM4gv3xS for <notmuch@notmuchmail.org>;
\r
17 Tue, 4 Dec 2012 13:26:53 -0800 (PST)
\r
18 Received: from mail-la0-f53.google.com (mail-la0-f53.google.com
\r
19 [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 3AEDF431FDE
\r
22 for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 13:26:45 -0800 (PST)
\r
23 Received: by mail-la0-f53.google.com with SMTP id w12so3787110lag.26
\r
24 for <notmuch@notmuchmail.org>; Tue, 04 Dec 2012 13:26:43 -0800 (PST)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=google.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
\r
28 :in-reply-to:references:x-gm-message-state;
\r
29 bh=RxUHeQW3VuU2eKDL4ZL1LSHCtD344lesDvEg/JURyX0=;
\r
30 b=TPiFhx+DH13jeRv/WbuDobmxPXtUlT3hPBaxB9vcfNn+8pFZnHSjc9XvRqCJdP7bjg
\r
31 oKM6GSziUlhHoPEWbDkDW7ZOYKPKXbS+b8FrL2bK98qiNSZ+3ckuqe8b3ztwqUnOrWAc
\r
32 c80NmHmSAKXJZK+GhSaiuaqWzJFvySpFzV1/cwTgQCy+wtJOX0GLSHS2dgDF9KYpvX0m
\r
33 Z/ubHcp7OblLV0gxYF+S6hijA9BkBX2/I6Se0b2n/GE4gSr3l/VcU0qiCr3WTuHW6g72
\r
34 FhStqf1NuchFbWCJTk3901ai5krpqyjT45CpxUPyaxmshRwm4mWLOt7taknezFqYXGul
\r
36 Received: by 10.152.125.7 with SMTP id mm7mr1727220lab.2.1354656403659;
\r
37 Tue, 04 Dec 2012 13:26:43 -0800 (PST)
\r
38 Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.
\r
40 by mx.google.com with ESMTPS id so7sm1195821lab.0.2012.12.04.13.26.42
\r
41 (version=SSLv3 cipher=OTHER); Tue, 04 Dec 2012 13:26:42 -0800 (PST)
\r
42 From: Jani Nikula <jani@nikula.org>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH 2/3] test: wrap 'wc -l' results in arithmetic evaluation to
\r
46 Date: Tue, 4 Dec 2012 23:26:32 +0200
\r
48 <34cf9a648edbee52377eaaddc949f20a4defe4f9.1354656085.git.jani@nikula.org>
\r
49 X-Mailer: git-send-email 1.7.10.4
\r
50 In-Reply-To: <cover.1354656085.git.jani@nikula.org>
\r
51 References: <cover.1354656085.git.jani@nikula.org>
\r
52 In-Reply-To: <cover.1354656085.git.jani@nikula.org>
\r
53 References: <cover.1354656085.git.jani@nikula.org>
\r
55 ALoCoQng1eQBFc2h2wFyB1jxiattFEA5AAoVq1l+TjAXO3ccRDBiDf0clWQiGjIapvWliru4jei0
\r
56 X-BeenThere: notmuch@notmuchmail.org
\r
57 X-Mailman-Version: 2.1.13
\r
59 List-Id: "Use and development of the notmuch mail system."
\r
60 <notmuch.notmuchmail.org>
\r
61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
64 List-Post: <mailto:notmuch@notmuchmail.org>
\r
65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
68 X-List-Received-Date: Tue, 04 Dec 2012 21:26:57 -0000
\r
70 This is for portability, as 'wc -l' emits whitespace on some BSD
\r
71 variants. Suggested by Tomi Ollila <tomi.ollila@iki.fi>.
\r
75 Updated version of id:1338361324-57289-8-git-send-email-pioto@pioto.org
\r
77 test/count | 12 ++++++++----
\r
78 1 file changed, 8 insertions(+), 4 deletions(-)
\r
80 diff --git a/test/count b/test/count
\r
81 index 8e587ff..879b114 100755
\r
84 @@ -4,24 +4,28 @@ test_description='"notmuch count" for messages and threads'
\r
88 +# Note: The 'wc -l' results below are wrapped in arithmetic evaluation
\r
89 +# $((...)) to strip whitespace. This is for portability, as 'wc -l'
\r
90 +# emits whitespace on some BSD variants.
\r
92 test_begin_subtest "message count is the default for notmuch count"
\r
94 - "`notmuch search --output=messages '*' | wc -l`" \
\r
95 + "$((`notmuch search --output=messages '*' | wc -l`))" \
\r
96 "`notmuch count '*'`"
\r
98 test_begin_subtest "message count with --output=messages"
\r
100 - "`notmuch search --output=messages '*' | wc -l`" \
\r
101 + "$((`notmuch search --output=messages '*' | wc -l`))" \
\r
102 "`notmuch count --output=messages '*'`"
\r
104 test_begin_subtest "thread count with --output=threads"
\r
105 test_expect_equal \
\r
106 - "`notmuch search --output=threads '*' | wc -l`" \
\r
107 + "$((`notmuch search --output=threads '*' | wc -l`))" \
\r
108 "`notmuch count --output=threads '*'`"
\r
110 test_begin_subtest "thread count is the default for notmuch search"
\r
111 test_expect_equal \
\r
112 - "`notmuch search '*' | wc -l`" \
\r
113 + "$((`notmuch search '*' | wc -l`))" \
\r
114 "`notmuch count --output=threads '*'`"
\r
116 test_begin_subtest "count with no matching messages"
\r