109 lines
3.6 KiB
Diff
109 lines
3.6 KiB
Diff
From b7c8661b9a34d048120753fdf27cd288e34e5308 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
|
|
<congdanhqx@gmail.com>
|
|
Date: Mon, 27 Jul 2020 20:11:00 +0700
|
|
Subject: [PATCH] configure: drop check for default xapian backend
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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 459e0cae..7dae745c 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -456,26 +456,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)... "
|
|
@@ -1507,9 +1487,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 7424881e..dc63ff1a 100644
|
|
--- a/test/test-lib.sh
|
|
+++ b/test/test-lib.sh
|
|
@@ -1255,16 +1255,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
|
|
|