unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH] test: expand regex in test/basic
Date: Sat, 10 Nov 2012 15:31:07 -0400	[thread overview]
Message-ID: <1352575867-12157-1-git-send-email-david@tethera.net> (raw)

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.

The use of basename is clunky, but at least is portable (unlike the
printf option to find)
---
 test/basic |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/basic b/test/basic
index c47197c..7420c7d 100755
--- a/test/basic
+++ b/test/basic
@@ -53,8 +53,17 @@ 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" | \
+
+
+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		\
+    -exec basename {} \; | \
     sort)
 test_expect_equal "$tests_in_suite" "$available"
 
-- 
1.7.10.4

             reply	other threads:[~2012-11-10 19:31 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-10 19:31 david [this message]
2012-11-10 19:36 ` [PATCH] test: expand regex in test/basic David Bremner
2012-11-10 20:18   ` Tomi Ollila
2012-11-15  1:30     ` [PATCH v2] " david
2012-11-15 13:28       ` Tomi Ollila
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=1352575867-12157-1-git-send-email-david@tethera.net \
    --to=david@tethera.net \
    --cc=bremner@debian.org \
    --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).