From: Tomi Ollila <tomi.ollila@iki.fi>
To: david@tethera.net, notmuch@notmuchmail.org
Subject: Re: [PATCH v2] test: expand regex in test/basic
In-Reply-To: <1352943054-930-1-git-send-email-david@tethera.net>
References: <m2haoxmctu.fsf@guru.guru-group.fi>
	<1352943054-930-1-git-send-email-david@tethera.net>
User-Agent: Notmuch/0.14+84~g8a199bf (http://notmuchmail.org) Emacs/24.2.1
	(x86_64-unknown-linux-gnu)
Date: Thu, 15 Nov 2012 15:28:22 +0200
Message-ID: <m21ufvm1vt.fsf@guru.guru-group.fi>
MIME-Version: 1.0
Content-Type: text/plain
Cc: David Bremner <bremner@debian.org>
Precedence: list

On Thu, Nov 15 2012, david@tethera.net wrote:

> From: David Bremner <bremner@debian.org>
>
> Over time, maintaining this very long regex has become irritating,
> especially when resolving conflicts.
>
> This patch replaces the call to sed with multiple extra arguments to
> find.  Since each test binary is now on it's own line, this should
> make resolving conflicts easier.

LGTM. Works. +1

Tomi


> ---
>  test/basic |   12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/test/basic b/test/basic
> index c47197c..1b842d2 100755
> --- a/test/basic
> +++ b/test/basic
> @@ -53,9 +53,15 @@ test_expect_code 2 'failure to clean up causes the test to fail' '
>  test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'
>  eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)
>  tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
> -available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \
> -    sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \
> -    sort)
> +available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111  \
> +    ! -name aggregate-results.sh	\
> +    ! -name arg-test			\
> +    ! -name notmuch-test		\
> +    ! -name parse-time			\
> +    ! -name smtp-dummy			\
> +    ! -name symbol-test			\
> +    ! -name test-verbose		\
> +    | sed 's,.*/,,' | sort)
>  test_expect_equal "$tests_in_suite" "$available"
>  
>  EXPECTED=$TEST_DIRECTORY/test.expected-output
> -- 
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch