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

diff --git a/76/3cb96d423bfd436ed7ba0469219358801456e4 b/76/3cb96d423bfd436ed7ba0469219358801456e4
new file mode 100644 (file)
index 0000000..e5fe85e
--- /dev/null
+++ b/76/3cb96d423bfd436ed7ba0469219358801456e4
@@ -0,0 +1,119 @@
+Return-Path: <jani@nikula.org>\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 B5E95431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 12:24:18 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 EnAAT3vW-iZf for <notmuch@notmuchmail.org>;\r
+       Tue, 11 Mar 2014 12:24:12 -0700 (PDT)\r
+Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com\r
+ [74.125.83.49])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 9627C431FBD   for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 12:24:12 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f49.google.com with SMTP id c41so3885344eek.22\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 12:24:11 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+       bh=MJZyN6EtlwKqbdzgIKTq3zrqHqIzN6UQvabf0niW3yY=;\r
+       b=LGhk6htCfihKmr/rSqpKdLqOqpy5I+3SGf/JXyrjjwGZg39KIQKI5bsVXTIAlNXCB8\r
+       yVGFoqlIXLyFpY+FnOjR1U1DXuFqQB5fBKxIvVAUgQ6Q/9pIH27LyOxsOcmXVHebgPUe\r
+       Kp2ASsXZ9QWOyfd9NElpE/d85itIN5nP/9gX/e3CXULO2fqBdkUCrTQ0MwfEVs+eGI4A\r
+       HGfiYigsmDdpDW/vZLV/nD03Bef1+vFUWNZitMKQynbnZyAWyWdkw5NrWMZ58sA0mgxT\r
+       GObBS8q8ZKrlSWbspRwDnFomzlcmQPEkz3QT2BEzNjsnq4ZnjpMCyNI63QvxICzYWtR5\r
+       vB6w==\r
+X-Gm-Message-State:\r
+ ALoCoQnGoSyvkQYyC7pR092e4LA/GbyHFCsx8LB9crtRvO3AhMXyFsUin2QtoQDIUEhtbJqWGsQN\r
+X-Received: by 10.15.41.140 with SMTP id s12mr43313483eev.4.1394565849909;\r
+       Tue, 11 Mar 2014 12:24:09 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+       cb5sm60793104eeb.18.2014.03.11.12.24.08 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Tue, 11 Mar 2014 12:24:09 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: conditionally test compact depending on configured\r
+       support\r
+Date: Tue, 11 Mar 2014 21:24:07 +0200\r
+Message-Id: <1394565847-26795-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.9.0\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:24:18 -0000\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
+ .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
+\r