Date: Sat, 26 May 2012 12:42:02 +1000
Message-ID: <20120526124202.GC2328@hili.localdomain>
From: Peter Wang <novalazy@gmail.com>
To: notmuch@notmuchmail.org
Subject: Re: [PATCH 06/10] Fix test/count on FreeBSD
In-Reply-To: <1337953411-21000-7-git-send-email-pioto@pioto.org>
References: <1337953411-21000-1-git-send-email-pioto@pioto.org>
	<1337953411-21000-7-git-send-email-pioto@pioto.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Precedence: list

On Fri, 25 May 2012 09:43:27 -0400, Mike Kelly <pioto@pioto.org> wrote:
> 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}`"

You could perform a proper integer comparison like:

test_expect_success "message count is the default for notmuch count" '
    test "`notmuch search --output=messages ${SEARCH} | wc -l`" \
     -eq "`notmuch count ${SEARCH}`"
'

Peter