test: drop the implicit prereq check mechanism from test_expect_*

[notmuch] / test / T000-basic.sh

diff --git a/test/T000-basic.sh b/test/T000-basic.sh
index bf08f3e66e84f4ce1d392c254c4b4d96546bd291..78e183361e7d5c572b4143c8160d02f722e15803 100755 (executable)
--- a/test/T000-basic.sh
+++ b/test/T000-basic.sh
@@ -14,7 +14,7 @@ then
        exit 1
 fi
 
-. ./test-lib.sh
+. ./test-lib.sh || exit 1
 
 ################################################################
 # Test harness
@@ -23,7 +23,7 @@ test_expect_success 'success is reported like this' '
 '
 test_set_prereq HAVEIT
 haveit=no
-test_expect_success HAVEIT 'test runs if prerequisite is satisfied' '
+test_expect_success 'test runs if prerequisite is satisfied' '
     test_have_prereq HAVEIT &&
     haveit=yes
 '
@@ -92,8 +92,7 @@ test_expect_equal \
     "$(echo $PATH|cut -f1 -d: | sed -e 's,/test/valgrind/bin$,,')"
 
 test_begin_subtest 'notmuch is compiled with debugging symbols'
-test_subtest_known_broken
-readelf --sections $(which notmuch) | grep \.debug
+readelf --sections $(command -v notmuch) | grep \.debug
 test_expect_equal 0 $?
 
 test_done