aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2012-11-10 15:16:04 -0400
committerGravatar David Bremner <bremner@debian.org>2012-11-10 16:47:10 -0400
commitb173037398ae61ddc1017f94c8a63a71b1b4c3fc (patch)
tree9650821e1d3fe535ed51193701982d78e5c4ffac /test
parentae459a3f4ca0e24cb2012bc4af7af3aea4731fec (diff)
test: expand regex in test/basic
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.
Diffstat (limited to 'test')
-rwxr-xr-xtest/basic12
1 files changed, 9 insertions, 3 deletions
diff --git a/test/basic b/test/basic
index c47197cb..1b842d2b 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