X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fbasic;h=e1269e28b2d9a8af4b067f9cba55b78bb5d49e5b;hp=309779ca7f1573a5c5528073f6579b4a127d6bff;hb=8a8d0b739509cf4c367f52aac26fd131fe665b46;hpb=ac9dbb47de734afb0ddd4d0b2eb8f5027b1a7f60 diff --git a/test/basic b/test/basic index 309779ca..e1269e28 100755 --- a/test/basic +++ b/test/basic @@ -52,7 +52,7 @@ 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' tests_in_suite=$(grep TESTS= ../notmuch-test | sed -e "s/TESTS=\"\(.*\)\"/\1/" | tr " " "\n" | sort) -available=$(ls -1 ../ | grep -v -E "^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test|README|test-lib.sh|test-results|tmp.*|valgrind|corpus*|emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|test.expected-output)" | sort) +available=$(ls -1 ../ | grep -v -E "^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test|README|test-lib.sh|test-results|tmp.*|valgrind|corpus*|emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|test.expected-output|.*~)" | sort) test_expect_equal "$tests_in_suite" "$available" EXPECTED=../test.expected-output @@ -71,6 +71,7 @@ output=$(cd ..; ./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 -r $TEST_DIRECTORY/tmp.test-verbose test_expect_equal "$output" "$expected"