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

diff --git a/ec/785c073839ad34f44ffe13bd9709fa982c9d13 b/ec/785c073839ad34f44ffe13bd9709fa982c9d13
new file mode 100644 (file)
index 0000000..a67f8df
--- /dev/null
+++ b/ec/785c073839ad34f44ffe13bd9709fa982c9d13
@@ -0,0 +1,107 @@
+Return-Path: <pioto@pioto.org>\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 C2C51431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 sNQ-iOUkGgia for <notmuch@notmuchmail.org>;\r
+       Fri, 25 May 2012 06:44:05 -0700 (PDT)\r
+Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com\r
+       [209.85.220.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 238AA431FD8\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:03 -0700 (PDT)\r
+Received: by mail-vc0-f181.google.com with SMTP id f1so727472vcb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:03 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=1/zXSacgeJt/5zEMX44iGrnQUfGxUSKz+j96wa4Asag=;\r
+       b=XXoPQABk25zd1JGIyGmesIARiiABhsxe2+rUSw0Tk1p1ql28CBNMQqH18u/q1NrhlQ\r
+       e2zHjiqPjFBWrJH4T1W4Yd6nb50dT7Ceojgsh4ivT9eGTWqTrjiPxoN++UTsGlg2lZ4k\r
+       VQh5KVyckUn31EPKuxTc3pOGpquU0B0UwrLT5R2yxkGVqeN7Fz64v6nZFHppOmV6P5zB\r
+       z874vD8hVhIHq8a+Z0rv/1qR8tq0bcQYT5T8oxpLmb5uy5x5MD7dZ0bcUCsnjzUHezKB\r
+       f87Qar7d44H9Pmop8Mg4xP1WWb7trqK0fRgSs2rx1TzvJByfJquGacRwUmavLd+EiHa5\r
+       2Q2A==\r
+Received: by 10.52.94.147 with SMTP id dc19mr3133183vdb.74.1337953442962;\r
+       Fri, 25 May 2012 06:44:02 -0700 (PDT)\r
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
+       [71.182.155.97])\r
+       by mx.google.com with ESMTPS id s10sm532858vdg.10.2012.05.25.06.44.02\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 25 May 2012 06:44:02 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id D9AFA287CA; Fri, 25 May 2012 09:44:01 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 06/10] Fix test/count on FreeBSD\r
+Date: Fri, 25 May 2012 09:43:27 -0400\r
+Message-Id: <1337953411-21000-7-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+References: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnLnrC48yBHAL5fwVhHMv++FfcEFgQe4DwaSqiBM6xk2fh9TyVk+MxQtir2hkRBTaykvEfR\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: Fri, 25 May 2012 13:44:07 -0000\r
+\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
+ test_begin_subtest "message count with --output=messages"\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 --output=messages ${SEARCH}`"\r
+ \r
+ test_begin_subtest "thread count with --output=threads"\r
+ test_expect_equal \\r
+-    "`notmuch search --output=threads ${SEARCH} | wc -l`" \\r
++    "`notmuch search --output=threads ${SEARCH} | wc -l |sed 's/^[[:space:]]*//'`" \\r
+     "`notmuch count --output=threads ${SEARCH}`"\r
+ \r
+ test_begin_subtest "thread count is the default for notmuch search"\r
+ test_expect_equal \\r
+-    "`notmuch search ${SEARCH} | wc -l`" \\r
++    "`notmuch search ${SEARCH} | wc -l |sed 's/^[[:space:]]*//'`" \\r
+     "`notmuch count --output=threads ${SEARCH}`"\r
+ \r
+ SEARCH="from:cworth and not from:cworth"\r
+-- \r
+1.7.10.2\r
+\r