From b173037398ae61ddc1017f94c8a63a71b1b4c3fc Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 10 Nov 2012 15:16:04 -0400 Subject: [PATCH 1/1] 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. --- test/basic | 12 +++++++++--- 1 file 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 -- 2.43.0