test_when_finished "(exit 2)"
'
+# 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)" | sort)
+test_expect_equal "$tests_in_suite" "$available"
+
################################################################
# Test mail store prepared in test-lib.sh
test_expect_success \
'PATH is set to this repository' \
- 'test "`echo $PATH|cut -f1 -d:`" = "`dirname ${TEST_DIRECTORY}`"'
+ 'test "`echo $PATH|cut -f1 -d: | sed -e 's,/test/valgrind/bin$,,'`" = "`dirname ${TEST_DIRECTORY}`"'
test_done