X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fbasic;h=f7eed320a04509ff43eb5b03df2c9664fc5cf490;hb=39408d0f7d71334c539327db5bbfe248cbab8e82;hp=4edf8315be8aaab92d648eddb8f1da70b1cef3ef;hpb=945196d79b56356aef945fad6f34a6a1a3a97ce1;p=notmuch

diff --git a/test/basic b/test/basic
index 4edf8315..f7eed320 100755
--- a/test/basic
+++ b/test/basic
@@ -53,9 +53,18 @@ 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 -executable -printf '%f\n' | \
-    sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test)$/d" | \
-    sort)
+available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f \
+   '(' -perm -100 -o -perm -10 -o -perm -1 ')' \
+    ! -name aggregate-results.sh	\
+    ! -name arg-test			\
+    ! -name hex-xcode			\
+    ! -name notmuch-test		\
+    ! -name parse-time			\
+    ! -name random-corpus		\
+    ! -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
@@ -65,15 +74,15 @@ suppress_diff_date() {
 }
 
 test_begin_subtest "Ensure that test output is suppressed unless the test fails"
-output=$(cd $TEST_DIRECTORY; ./test-verbose 2>&1 | suppress_diff_date)
+output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose 2>&1 | suppress_diff_date)
 expected=$(cat $EXPECTED/test-verbose-no | suppress_diff_date)
 test_expect_equal "$output" "$expected"
 
 test_begin_subtest "Ensure that -v does not suppress test output"
-output=$(cd $TEST_DIRECTORY; ./test-verbose -v 2>&1 | suppress_diff_date)
+output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose -v 2>&1 | suppress_diff_date)
 expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date)
 # Do not include the results of test-verbose in totals
-rm $TEST_DIRECTORY/test-results/test-verbose-*
+rm $TEST_DIRECTORY/test-results/test-verbose
 rm -r $TEST_DIRECTORY/tmp.test-verbose
 test_expect_equal "$output" "$expected"