smime: Index cleartext of envelopedData when requested

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

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