From: David Bremner <brem...@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
