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

diff --git a/11/e4becff75cb8a01e0ac59701e0e9c96ea47276 b/11/e4becff75cb8a01e0ac59701e0e9c96ea47276
new file mode 100644 (file)
index 0000000..60f6704
--- /dev/null
+++ b/11/e4becff75cb8a01e0ac59701e0e9c96ea47276
@@ -0,0 +1,123 @@
+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 B7452431FC0\r
+       for <notmuch@notmuchmail.org>; Wed, 12 Mar 2014 10:26:16 -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 9xRj-h4cDmBA for <notmuch@notmuchmail.org>;\r
+       Wed, 12 Mar 2014 10:26:10 -0700 (PDT)\r
+Received: from mail-la0-f45.google.com (mail-la0-f45.google.com\r
+       [209.85.215.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8B950431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 12 Mar 2014 10:26:10 -0700 (PDT)\r
+Received: by mail-la0-f45.google.com with SMTP id hr17so6982999lab.32\r
+       for <notmuch@notmuchmail.org>; Wed, 12 Mar 2014 10:26:07 -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:in-reply-to\r
+       :references;\r
+       bh=lgV+kGYrhxJQEh5aMZa5Tr4QHZJ9mlxpvMYv2OrcRZ4=;\r
+       b=E6kTotguBqqPMDqbvhXx1nZYrxf6nff+mL4Y6vx0DqZTi3pkwt/9LlR6JWTVMwZeJp\r
+       KOSCBVigeZOS3gLVLJLb7IBTvxBh+snSOSAF8F3W/SAJbAZcJyZPnhW5/zu/inXdwgSS\r
+       OvlXM8mAo0H8RqoUd+kNkWA5s6DeIpBnc5QcrOXuLTDncs6CLlgUsnLSxmiWlfFIr9su\r
+       3sh7HVmuK1KsLWmVfhv2wIdMvqnPs+dFZ4rpJPNrO/saMzp7ci9LruXm88zDfUFvwo0Y\r
+       dulLSzDEarKul4xtx+0Rt6RDhUpyPykF1KPnBeO0VxcNXm6o4kM2P+rwtgK5ICQOO06e\r
+       Fgdw==\r
+X-Gm-Message-State:\r
+ ALoCoQlnorOG5eilzmvt23suEtEumji/LcwwsLudjRNJlN0wPobUgQMLWnDKeILPOAwUJcE9jeWI\r
+X-Received: by 10.152.225.70 with SMTP id ri6mr32641415lac.26.1394645167570;\r
+       Wed, 12 Mar 2014 10:26:07 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id u4sm4907707laj.2.2014.03.12.10.26.05\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Wed, 12 Mar 2014 10:26:05 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] test: conditionally test compact depending on configured\r
+       support\r
+Date: Wed, 12 Mar 2014 19:26:04 +0200\r
+Message-Id: <1394645164-23561-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.9.0\r
+In-Reply-To: <m2mwgwwmfl.fsf@guru.guru-group.fi>\r
+References: <m2mwgwwmfl.fsf@guru.guru-group.fi>\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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: Wed, 12 Mar 2014 17:26:16 -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  |  8 ++++++++\r
+ test/T020-compact.sh | 11 +++++++++++\r
+ 2 files changed, 19 insertions(+)\r
+\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 36b1c1b71de0..781420164105 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -35,9 +35,17 @@ $(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
++      ln -sf /bin/true $@\r
++else\r
++      ln -sf /bin/false $@\r
++endif\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