Re: [PATCH] test: conditionally test compact depending on configured support

diff --git a/b9/cf3517e3bf247aaefe9c9f193bbd5c2ea96fc4 b/b9/cf3517e3bf247aaefe9c9f193bbd5c2ea96fc4
new file mode 100644 (file)
index 0000000..e82b3c3
--- /dev/null
+++ b/b9/cf3517e3bf247aaefe9c9f193bbd5c2ea96fc4
@@ -0,0 +1,133 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 181E4431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 12:43:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Hh8GAbmYRtuc for <notmuch@notmuchmail.org>;\r
+       Tue, 11 Mar 2014 12:43:47 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6DB84431FBD\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 12:43:47 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id EC68610008C;\r
+       Tue, 11 Mar 2014 21:43:42 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: conditionally test compact depending on configured\r
+       support\r
+In-Reply-To: <1394565847-26795-1-git-send-email-jani@nikula.org>\r
+References: <1394565847-26795-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.17+112~g4e0c1d5 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 11 Mar 2014 21:43:42 +0200\r
+Message-ID: <m2mwgwwmfl.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 11 Mar 2014 19:43:55 -0000\r
+\r
+On Tue, Mar 11 2014, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> I still have one machine with old enough Xapian to not have compaction\r
+> support. Make the tests check for unsupported compact operation when\r
+> compact is not available.\r
+> ---\r
+>  test/Makefile.local  |  9 +++++++++\r
+>  test/T020-compact.sh | 11 +++++++++++\r
+>  2 files changed, 20 insertions(+)\r
+>\r
+> diff --git a/test/Makefile.local b/test/Makefile.local\r
+> index 36b1c1b71de0..8befa40dfaa4 100644\r
+> --- a/test/Makefile.local\r
+> +++ b/test/Makefile.local\r
+> @@ -35,9 +35,18 @@ $(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)\r
+>  $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o\r
+>      $(call quiet,CC) $^ -o $@\r
+>  \r
+> +$(dir)/have-compact: Makefile.config\r
+> +ifeq ($(HAVE_XAPIAN_COMPACT),1)\r
+> +    echo -n "#!/bin/sh\nexit 0\n" > $@\r
+> +else\r
+> +    echo -n "#!/bin/sh\nexit 1\n" > $@\r
+> +endif\r
+> +    chmod +x $@\r
+> +\r
+\r
+printf '$#/bin/sh\nexit1\n' ...\r
+\r
+... as '\n' expansion is not portable (bash by default do not expand, \r
+dash does)\r
+\r
+alternative:\r
+\r
+$(dir)/have-compact: Makefile.config\r
+ifeq ($(HAVE_XAPIAN_COMPACT),1)\r
+     ln -s /bin/true $@\r
+else\r
+     ln -s /bin/false $@\r
+endif\r
+\r
+\r
+this is soo much faster ;)\r
+     1) no shell needed in make\r
+     2) no shell needs to be executed when running have-compact\r
+\r
+otherwise LGTM.\r
+\r
+Tomi\r
+\r
+\r
+>  .PHONY: test check\r
+>  \r
+>  TEST_BINARIES=$(dir)/arg-test \\r
+> +          $(dir)/have-compact \\r
+>            $(dir)/hex-xcode \\r
+>            $(dir)/random-corpus \\r
+>            $(dir)/parse-time \\r
+> diff --git a/test/T020-compact.sh b/test/T020-compact.sh\r
+> index ac174cec7111..77bb9632cb11 100755\r
+> --- a/test/T020-compact.sh\r
+> +++ b/test/T020-compact.sh\r
+> @@ -10,6 +10,17 @@ notmuch tag +tag1 \*\r
+>  notmuch tag +tag2 subject:Two\r
+>  notmuch tag -tag1 +tag3 subject:Three\r
+>  \r
+> +if ! ${TEST_DIRECTORY}/have-compact; then\r
+> +    test_begin_subtest "Compact unsupported: error message"\r
+> +    output=$(notmuch compact --quiet 2>&1)\r
+> +    test_expect_equal "$output" "notmuch was compiled against a xapian version lacking compaction support.\r
+> +Compaction failed: Unsupported operation"\r
+> +\r
+> +    test_expect_code 1 "Compact unsupported: status code" "notmuch compact"\r
+> +\r
+> +    test_done\r
+> +fi\r
+> +\r
+>  test_expect_success "Running compact" "notmuch compact --backup=${TEST_DIRECTORY}/xapian.old"\r
+>  \r
+>  test_begin_subtest "Compact preserves database"\r
+> -- \r
+> 1.9.0\r