unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: notmuch@notmuchmail.org
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
Subject: [PATCH] configure: drop check for default xapian backend
Date: Mon, 27 Jul 2020 22:41:07 +0700	[thread overview]
Message-ID: <20200727154108.16269-3-congdanhqx@gmail.com> (raw)
In-Reply-To: <20200727154108.16269-1-congdanhqx@gmail.com>

Starting from xapian 1.3.5, xapian switched default backend to glass.

From 00cdfe10 (build: drop support for xapian versions less than 1.4,
2020-04-22), we only support xapian 1.4.0+. Effectively, we don't need
to check for default xapian backend anymore.

Let's drop it.

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
 configure                  | 23 -----------------------
 test/T360-symbol-hiding.sh |  4 ++--
 test/test-lib.sh           | 11 +----------
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/configure b/configure
index 90bc9182..bb17054a 100755
--- a/configure
+++ b/configure
@@ -457,26 +457,6 @@ if [ ${have_xapian} = "0" ]; then
     errors=$((errors + 1))
 fi
 
-if [ ${have_xapian} = "1" ]; then
-    default_xapian_backend=""
-    printf "Testing default Xapian backend... "
-    cat >_default_backend.cc <<EOF
-#include <xapian.h>
-int main(int argc, char** argv) {
-   Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
-}
-EOF
-    ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
-    ./_default_backend
-    if [ -f test.db/iamglass ]; then
-	default_xapian_backend=glass
-    else
-	default_xapian_backend=chert
-    fi
-    printf "%s\n" "${default_xapian_backend}";
-    rm -rf test.db _default_backend _default_backend.cc
-fi
-
 GMIME_MINVER=3.0.3
 
 printf "Checking for GMime development files (>= $GMIME_MINVER)... "
@@ -1515,9 +1495,6 @@ NOTMUCH_SRCDIR='${NOTMUCH_SRCDIR}'
 # Whether to have Xapian retry lock
 NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK=${WITH_RETRY_LOCK}
 
-# Which backend will Xapian use by default?
-NOTMUCH_DEFAULT_XAPIAN_BACKEND=${default_xapian_backend}
-
 # Whether GMime can verify X.509 certificate validity
 NOTMUCH_GMIME_X509_CERT_VALIDITY=${gmime_x509_cert_validity}
 
diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
index 43921cb4..eb438a7a 100755
--- a/test/T360-symbol-hiding.sh
+++ b/test/T360-symbol-hiding.sh
@@ -14,11 +14,11 @@ test_description='exception symbol hiding'
 test_begin_subtest 'running test' run_test
 mkdir -p ${PWD}/fakedb/.notmuch
 $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent 2>&1 \
-	| notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,${NOTMUCH_DEFAULT_XAPIAN_BACKEND},backend,g" > OUTPUT
+	| notmuch_dir_sanitize | sed -e "s,\`,\',g" > OUTPUT
 
 cat <<EOF > EXPECTED
 A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian'
-caught No backend database found at path 'CWD/nonexistent'
+caught No glass database found at path 'CWD/nonexistent'
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 8c331b88..9142f6b2 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -1260,16 +1260,7 @@ ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
 rm -f y
 
 # convert variable from configure to more convenient form
-case "$NOTMUCH_DEFAULT_XAPIAN_BACKEND" in
-    glass)
-	db_ending=glass
-    ;;
-    chert)
-	db_ending=DB
-    ;;
-    *)
-	error "Unknown Xapian backend $NOTMUCH_DEFAULT_XAPIAN_BACKEND"
-esac
+db_ending=glass
 # declare prerequisites for external binaries used in tests
 test_declare_external_prereq dtach
 test_declare_external_prereq emacs
-- 
2.28.0.rc2.21.g5c06d60fc5\r

  parent reply	other threads:[~2020-07-27 15:41 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-27 15:41 [PATCH] configure: detect version by compiler for build Đoàn Trần Công Danh
2020-07-27 15:41 ` [PATCH] configure: account for various name of pytest-3 Đoàn Trần Công Danh
2020-07-27 17:37   ` Tomi Ollila
2020-07-28  0:28     ` [PATCH v2] configure: check for pytest with python -m pytest Đoàn Trần Công Danh
2020-07-27 15:41 ` Đoàn Trần Công Danh [this message]
2020-07-28 11:17   ` [PATCH] configure: drop check for default xapian backend David Bremner
2020-07-28 13:36     ` Đoàn Trần Công Danh
2020-07-30  0:05       ` David Bremner
2020-07-31 13:49         ` Đoàn Trần Công Danh
2020-07-31 14:41           ` David Bremner
2020-07-27 15:41 ` [PATCH] T355: specify hash algorithm explicitly Đoàn Trần Công Danh
2020-07-27 17:00   ` Đoàn Trần Công Danh
2020-07-27 17:40   ` Tomi Ollila
2020-07-27 23:42     ` Đoàn Trần Công Danh
2020-07-27 17:31 ` [PATCH] configure: detect version by compiler for build Tomi Ollila
2020-07-28  0:18   ` Đoàn Trần Công Danh
2020-07-28 11:25     ` David Bremner
2020-07-28 13:43       ` Đoàn Trần Công Danh
2020-08-03 15:40 ` [PATCH v2] configure: check for pytest with python -m pytest Đoàn Trần Công Danh
2020-08-07 17:12   ` Tomi Ollila
2020-08-08 19:14     ` David Bremner
2020-08-03 15:40 ` [PATCH v2] configure: drop check for default xapian backend Đoàn Trần Công Danh
2020-08-03 15:40 ` [PATCH v2] T355: specify hash algorithm explicitly Đoàn Trần Công Danh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200727154108.16269-3-congdanhqx@gmail.com \
    --to=congdanhqx@gmail.com \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).