X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fbasic;h=1b842d2bf1d309029a52db2d29ca3b0a703ec859;hb=fe13a55421da077ceee3fb0def1db1154d152717;hp=38db2baf74d97f0c27878a03fe5ecf207bcb1052;hpb=9ade8160a6a3f6f55996d7a58dc2cd81a6df8395;p=notmuch

diff --git a/test/basic b/test/basic
index 38db2baf..1b842d2b 100755
--- a/test/basic
+++ b/test/basic
@@ -51,17 +51,17 @@ test_expect_code 2 'failure to clean up causes the test to fail' '
 
 # Ensure that all tests are being run
 test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'
-eval $(sed -n -e '/^TESTS="$/,/^"$/p' notmuch-test $TEST_DIRECTORY/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=$(ls -1 $TEST_DIRECTORY/ | \
-    sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \
-	   -e "/^(README|test-lib.sh|test-lib.el|test-results|tmp.*|valgrind|corpus*)/d" \
-	   -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc)/d" \
-	   -e "/^(test.expected-output|.*~)/d" \
-	   -e "/^(gnupg-secret-key.asc)/d" \
-	   -e "/^(gnupg-secret-key.NOTE)/d" \
-	   -e "/^(atomicity.gdb)/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