tests/smime: Test indexing cleartext of envelopedData

[notmuch] / test / T620-lock.sh

diff --git a/test/T620-lock.sh b/test/T620-lock.sh
index f46475e8ddccf6dc1926b7cf198da3d088592194..7aaaff2ababea2bc9ef6a6cd7bc9844782a30f38 100755 (executable)
--- a/test/T620-lock.sh
+++ b/test/T620-lock.sh
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 test_description="locking"
-. ./test-lib.sh || exit 1
-
-if [ "${NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK}" = "0" ]; then
-    test_subtest_missing_external_prereq_["lock retry support"]=t
-fi
+. $(dirname "$0")/test-lib.sh || exit 1
 
 add_email_corpus
 
 test_begin_subtest "blocking open"
+if [ $NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK -ne 1 ]; then
+    test_subtest_known_broken
+fi
 test_C ${MAIL_DIR} <<'EOF'
 #include <unistd.h>
 #include <stdlib.h>
@@ -70,6 +69,9 @@ inbox
 parent
 unread
 EOF
+if [ $NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK -ne 1 ]; then
+    test_subtest_known_broken
+fi
 test_expect_equal_file EXPECTED OUTPUT
 
 test_done