test: drop the implicit prereq check mechanism from test_expect_*

[notmuch] / test / T010-help-test.sh

diff --git a/test/T010-help-test.sh b/test/T010-help-test.sh
index 77410bc54e66253b57fccef0013f0d4c3034acf4..c173237631125ebd68894508763f1f61fab94d74 100755 (executable)
--- a/test/T010-help-test.sh
+++ b/test/T010-help-test.sh
@@ -1,20 +1,20 @@
 #!/usr/bin/env bash
 
 test_description="online help"
-. ./test-lib.sh
+. ./test-lib.sh || exit 1
 
 test_expect_success 'notmuch --help' 'notmuch --help'
 test_expect_success 'notmuch help' 'notmuch help'
 test_expect_success 'notmuch --version' 'notmuch --version'
 
-if ${TEST_DIRECTORY}/have-man; then
+if [ $NOTMUCH_HAVE_MAN -eq 1 ]; then
     test_expect_success 'notmuch --help tag' 'notmuch --help tag'
     test_expect_success 'notmuch help tag' 'notmuch help tag'
 else
     test_expect_success 'notmuch --help tag (man pages not available)' \
-       'test_must_fail notmuch --help tag'
+       'test_must_fail notmuch --help tag >/dev/null'
     test_expect_success 'notmuch help tag (man pages not available)' \
-       'test_must_fail notmuch help tag'
+       'test_must_fail notmuch help tag >/dev/null'
 fi
 
 test_done