Re: [PATCH 06/10] Fix test/count on FreeBSD

diff --git a/7f/81120fb309213410863605d1abb756b81a8cf2 b/7f/81120fb309213410863605d1abb756b81a8cf2
new file mode 100644 (file)
index 0000000..8b0361b
--- /dev/null
+++ b/7f/81120fb309213410863605d1abb756b81a8cf2
@@ -0,0 +1,94 @@
+Return-Path: <novalazy@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 34F82431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 19:42:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id WuQ4agmCzcIB for <notmuch@notmuchmail.org>;\r
+       Fri, 25 May 2012 19:42:09 -0700 (PDT)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+       [209.85.160.53]) (using TLSv1 with cipher RC4-MD5 (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 88087431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 19:42:09 -0700 (PDT)\r
+Received: by pbbrr13 with SMTP id rr13so2928683pbb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 19:42:08 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=date:message-id:from:to:subject:in-reply-to:references:mime-version\r
+       :content-type:content-disposition:content-transfer-encoding;\r
+       bh=SCbHqS54x4FxK+PCN9RkT1XrGTHNnsbB189ErBGWl30=;\r
+       b=B0KVH/K4T30ZhH7EM8wphGfbEJ9HJVLwPZ8N8OuNBhEYvnVlYJMXN35O1lvcA+PoE4\r
+       MfHkOykIQqvO/+yrd76uC2y7HrB/xuIqMNfNFcoC6oyBuqXjCZrROUcz6btPrjmmG9TO\r
+       v3pKNQ7yiCrJU5jX6GXffIXGMWHyIwgTEpYRWptjakX8ymssDQ6Gfgv6V3WyoPXOHI90\r
+       JX67cNU4OMUzquk6wpK00peQ9erbPWqNrpPJxgXvACDLuo4yFpIXgdavtvzzkmgrhnvw\r
+       ZH/kV1Te9xN6l5SPlQncDRsVUbzRYG+9e/nhEd+MNZDjI+/mqMvBT/oJ7ufckCrk0RNd\r
+       YXaQ==\r
+Received: by 10.68.201.169 with SMTP id kb9mr3186099pbc.101.1338000128683;\r
+       Fri, 25 May 2012 19:42:08 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id nw7sm10970332pbb.73.2012.05.25.19.42.05\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 25 May 2012 19:42:07 -0700 (PDT)\r
+Date: Sat, 26 May 2012 12:42:02 +1000\r
+Message-ID: <20120526124202.GC2328@hili.localdomain>\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 06/10] Fix test/count on FreeBSD\r
+In-Reply-To: <1337953411-21000-7-git-send-email-pioto@pioto.org>\r
+References: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+       <1337953411-21000-7-git-send-email-pioto@pioto.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: 8bit\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 26 May 2012 02:42:10 -0000\r
+\r
+On Fri, 25 May 2012 09:43:27 -0400, Mike Kelly <pioto@pioto.org> wrote:\r
+> FreeBSD's `wc -l` includes some white space in front of the number, so\r
+> trim it off.\r
+> ---\r
+>  test/count |    8 ++++----\r
+>  1 file changed, 4 insertions(+), 4 deletions(-)\r
+> \r
+> diff --git a/test/count b/test/count\r
+> index 300b171..618dbb9 100755\r
+> --- a/test/count\r
+> +++ b/test/count\r
+> @@ -8,22 +8,22 @@ SEARCH="\"*\""\r
+>  \r
+>  test_begin_subtest "message count is the default for notmuch count"\r
+>  test_expect_equal \\r
+> -    "`notmuch search --output=messages ${SEARCH} | wc -l`" \\r
+> +    "`notmuch search --output=messages ${SEARCH} | wc -l |sed 's/^[[:space:]]*//'`" \\r
+>      "`notmuch count ${SEARCH}`"\r
+\r
+You could perform a proper integer comparison like:\r
+\r
+test_expect_success "message count is the default for notmuch count" '\r
+    test "`notmuch search --output=messages ${SEARCH} | wc -l`" \\r
+     -eq "`notmuch count ${SEARCH}`"\r
+'\r
+\r
+Peter\r