From: Tomi Ollila <tomi.ollila@iki.fi>
To: david@tethera.net, notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: Re: [PATCH v2] test: expand regex in test/basic
Date: Thu, 15 Nov 2012 15:28:22 +0200 [thread overview]
Message-ID: <m21ufvm1vt.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <1352943054-930-1-git-send-email-david@tethera.net>
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
next prev parent reply other threads:[~2012-11-15 13:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-10 19:31 [PATCH] test: expand regex in test/basic david
2012-11-10 19:36 ` David Bremner
2012-11-10 20:18 ` Tomi Ollila
2012-11-15 1:30 ` [PATCH v2] " david
2012-11-15 13:28 ` Tomi Ollila [this message]
2012-11-15 19:18 ` Austin Clements
2012-11-15 22:26 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m21ufvm1vt.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=bremner@debian.org \
--cc=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).