From 425d5e9566022f5ae34437d182de452ed32fd1b0 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Sat, 26 May 2012 09:43:27 +2000 Subject: [PATCH] [PATCH 06/10] Fix test/count on FreeBSD --- ec/785c073839ad34f44ffe13bd9709fa982c9d13 | 107 ++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 ec/785c073839ad34f44ffe13bd9709fa982c9d13 diff --git a/ec/785c073839ad34f44ffe13bd9709fa982c9d13 b/ec/785c073839ad34f44ffe13bd9709fa982c9d13 new file mode 100644 index 000000000..a67f8df43 --- /dev/null +++ b/ec/785c073839ad34f44ffe13bd9709fa982c9d13 @@ -0,0 +1,107 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C2C51431FBC + for ; Fri, 25 May 2012 06:44:06 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id sNQ-iOUkGgia for ; + Fri, 25 May 2012 06:44:05 -0700 (PDT) +Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com + [209.85.220.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 238AA431FD8 + for ; Fri, 25 May 2012 06:44:03 -0700 (PDT) +Received: by mail-vc0-f181.google.com with SMTP id f1so727472vcb.26 + for ; Fri, 25 May 2012 06:44:03 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references + :x-gm-message-state; + bh=1/zXSacgeJt/5zEMX44iGrnQUfGxUSKz+j96wa4Asag=; + b=XXoPQABk25zd1JGIyGmesIARiiABhsxe2+rUSw0Tk1p1ql28CBNMQqH18u/q1NrhlQ + e2zHjiqPjFBWrJH4T1W4Yd6nb50dT7Ceojgsh4ivT9eGTWqTrjiPxoN++UTsGlg2lZ4k + VQh5KVyckUn31EPKuxTc3pOGpquU0B0UwrLT5R2yxkGVqeN7Fz64v6nZFHppOmV6P5zB + z874vD8hVhIHq8a+Z0rv/1qR8tq0bcQYT5T8oxpLmb5uy5x5MD7dZ0bcUCsnjzUHezKB + f87Qar7d44H9Pmop8Mg4xP1WWb7trqK0fRgSs2rx1TzvJByfJquGacRwUmavLd+EiHa5 + 2Q2A== +Received: by 10.52.94.147 with SMTP id dc19mr3133183vdb.74.1337953442962; + Fri, 25 May 2012 06:44:02 -0700 (PDT) +Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net. + [71.182.155.97]) + by mx.google.com with ESMTPS id s10sm532858vdg.10.2012.05.25.06.44.02 + (version=TLSv1/SSLv3 cipher=OTHER); + Fri, 25 May 2012 06:44:02 -0700 (PDT) +Received: by nas.home.pioto.org (Postfix, from userid 1001) + id D9AFA287CA; Fri, 25 May 2012 09:44:01 -0400 (EDT) +From: Mike Kelly +To: notmuch@notmuchmail.org +Subject: [PATCH 06/10] Fix test/count on FreeBSD +Date: Fri, 25 May 2012 09:43:27 -0400 +Message-Id: <1337953411-21000-7-git-send-email-pioto@pioto.org> +X-Mailer: git-send-email 1.7.10.2 +In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org> +References: <1337953411-21000-1-git-send-email-pioto@pioto.org> +X-Gm-Message-State: + ALoCoQnLnrC48yBHAL5fwVhHMv++FfcEFgQe4DwaSqiBM6xk2fh9TyVk+MxQtir2hkRBTaykvEfR +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 25 May 2012 13:44:07 -0000 + +FreeBSD's `wc -l` includes some white space in front of the number, so +trim it off. +--- + test/count | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/count b/test/count +index 300b171..618dbb9 100755 +--- a/test/count ++++ b/test/count +@@ -8,22 +8,22 @@ SEARCH="\"*\"" + + test_begin_subtest "message count is the default for notmuch count" + test_expect_equal \ +- "`notmuch search --output=messages ${SEARCH} | wc -l`" \ ++ "`notmuch search --output=messages ${SEARCH} | wc -l |sed 's/^[[:space:]]*//'`" \ + "`notmuch count ${SEARCH}`" + + test_begin_subtest "message count with --output=messages" + test_expect_equal \ +- "`notmuch search --output=messages ${SEARCH} | wc -l`" \ ++ "`notmuch search --output=messages ${SEARCH} | wc -l |sed 's/^[[:space:]]*//'`" \ + "`notmuch count --output=messages ${SEARCH}`" + + test_begin_subtest "thread count with --output=threads" + test_expect_equal \ +- "`notmuch search --output=threads ${SEARCH} | wc -l`" \ ++ "`notmuch search --output=threads ${SEARCH} | wc -l |sed 's/^[[:space:]]*//'`" \ + "`notmuch count --output=threads ${SEARCH}`" + + test_begin_subtest "thread count is the default for notmuch search" + test_expect_equal \ +- "`notmuch search ${SEARCH} | wc -l`" \ ++ "`notmuch search ${SEARCH} | wc -l |sed 's/^[[:space:]]*//'`" \ + "`notmuch count --output=threads ${SEARCH}`" + + SEARCH="from:cworth and not from:cworth" +-- +1.7.10.2 + -- 2.26.2