[PATCH 3/4] configure: add test for default xapian backend

diff --git a/8b/8fbb9c9fb30317efac98ef11ceb94a5767890f b/8b/8fbb9c9fb30317efac98ef11ceb94a5767890f
new file mode 100644 (file)
index 0000000..2806fb9
--- /dev/null
+++ b/8b/8fbb9c9fb30317efac98ef11ceb94a5767890f
@@ -0,0 +1,131 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 1BA4C6DE035C\r
+ for <notmuch@notmuchmail.org>; Fri,  8 Apr 2016 18:50:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.02\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.02 tagged_above=-999 required=5 tests=[AWL=-0.009,\r
+  SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id HHdxGtxfWsAx for <notmuch@notmuchmail.org>;\r
+ Fri,  8 Apr 2016 18:50:15 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 01BC56DE02D0\r
+ for <notmuch@notmuchmail.org>; Fri,  8 Apr 2016 18:50:01 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1aoi2M-00022p-U7; Fri, 08 Apr 2016 21:50:10 -0400\r
+Received: (nullmailer pid 6634 invoked by uid 1000);\r
+ Sat, 09 Apr 2016 01:49:55 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4] configure: add test for default xapian backend\r
+Date: Fri,  8 Apr 2016 22:49:49 -0300\r
+Message-Id: <1460166590-6526-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.0.rc3\r
+In-Reply-To: <1460166590-6526-1-git-send-email-david@tethera.net>\r
+References: <1460166590-6526-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 09 Apr 2016 01:50:23 -0000\r
+\r
+This is mainly for the test suite.  We already expect the tests to be\r
+run in the same environment as configure was run, at least to get the\r
+name of the python interpreter. So we are not really imposing a new\r
+restriction.\r
+---\r
+ configure        | 26 +++++++++++++++++++++++++-\r
+ test/test-lib.sh | 11 +++++++++++\r
+ 2 files changed, 36 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/configure b/configure\r
+index eb6dbac..4fc31cc 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -371,7 +371,25 @@ if [ ${have_xapian} = "1" ]; then\r
+     esac\r
+ fi\r
+ \r
+-\r
++default_xapian_backend=""\r
++if [ ${have_xapian} = "1" ]; then\r
++    printf "Testing default Xapian backend... "\r
++    cat >_default_backend.cc <<EOF\r
++#include <xapian.h>\r
++int main(int argc, char** argv) {\r
++   Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);\r
++}\r
++EOF\r
++    ${CXX} ${CXXLAGS} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}\r
++    ./_default_backend\r
++    if [ -f test.db/iamglass ]; then\r
++      default_xapian_backend=glass\r
++    else\r
++      default_xapian_backend=chert\r
++    fi\r
++    printf "${default_xapian_backend}\n";\r
++    rm -rf test.db _default_backend _default_backend.cc\r
++fi\r
+ # we need to have a version >= 2.6.5 to avoid a crypto bug. We need\r
+ # 2.6.7 for permissive "From " header handling.\r
+ GMIME_MINVER=2.6.7\r
+@@ -1001,6 +1019,9 @@ LINKER_RESOLVES_LIBRARY_DEPENDENCIES = ${linker_resolves_library_dependencies}\r
+ XAPIAN_CXXFLAGS = ${xapian_cxxflags}\r
+ XAPIAN_LDFLAGS = ${xapian_ldflags}\r
+ \r
++# Which backend will Xapian use by default?\r
++DEFAULT_XAPIAN_BACKEND = ${default_xapian_backend}\r
++\r
+ # Flags needed to compile and link against GMime\r
+ GMIME_CFLAGS = ${gmime_cflags}\r
+ GMIME_LDFLAGS = ${gmime_ldflags}\r
+@@ -1077,6 +1098,9 @@ cat > sh.config <<EOF\r
+ # Whether the Xapian version in use supports compaction\r
+ NOTMUCH_HAVE_XAPIAN_COMPACT=${have_xapian_compact}\r
+ \r
++# Which backend will Xapian use by default?\r
++NOTMUCH_DEFAULT_XAPIAN_BACKEND=${default_xapian_backend}\r
++\r
+ # do we have man pages?\r
+ NOTMUCH_HAVE_MAN=$((have_sphinx))\r
+ \r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index cc08a98..ac04b15 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -1327,6 +1327,17 @@ test -z "$NO_PYTHON" && test_set_prereq PYTHON\r
+ ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS\r
+ rm -f y\r
+ \r
++# convert variable from configure to more convenient form\r
++case "$NOTMUCH_DEFAULT_XAPIAN_BACKEND" in\r
++    glass)\r
++      db_ending=glass\r
++    ;;\r
++    chert)\r
++      db_ending=DB\r
++    ;;\r
++    *)\r
++      error "Unknown Xapian backend $NOTMUCH_DEFAULT_XAPIAN_BACKEND"\r
++esac\r
+ # declare prerequisites for external binaries used in tests\r
+ test_declare_external_prereq dtach\r
+ test_declare_external_prereq emacs\r
+-- \r
+2.8.0.rc3\r
+\r