X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fbasic;h=64eb7d74eac5163483a199b0add3f59432a2a299;hb=19a89753ca20b269a131e747238925cce254c627;hp=1b842d2bf1d309029a52db2d29ca3b0a703ec859;hpb=b173037398ae61ddc1017f94c8a63a71b1b4c3fc;p=notmuch diff --git a/test/basic b/test/basic index 1b842d2b..64eb7d74 100755 --- a/test/basic +++ b/test/basic @@ -53,11 +53,14 @@ 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 \ +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 \ @@ -79,7 +82,7 @@ test_begin_subtest "Ensure that -v does not suppress test output" output=$(cd $TEST_DIRECTORY; ./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"