11/e4becff75cb8a01e0ac59701e0e9c96ea47276

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id B7452431FC0\r
   6         for <notmuch@notmuchmail.org>; Wed, 12 Mar 2014 10:26:16 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id 9xRj-h4cDmBA for <notmuch@notmuchmail.org>;\r
  16         Wed, 12 Mar 2014 10:26:10 -0700 (PDT)\r
  17 Received: from mail-la0-f45.google.com (mail-la0-f45.google.com\r
  18         [209.85.215.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id 8B950431FAE\r
  21         for <notmuch@notmuchmail.org>; Wed, 12 Mar 2014 10:26:10 -0700 (PDT)\r
  22 Received: by mail-la0-f45.google.com with SMTP id hr17so6982999lab.32\r
  23         for <notmuch@notmuchmail.org>; Wed, 12 Mar 2014 10:26:07 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  27         :references;\r
  28         bh=lgV+kGYrhxJQEh5aMZa5Tr4QHZJ9mlxpvMYv2OrcRZ4=;\r
  29         b=E6kTotguBqqPMDqbvhXx1nZYrxf6nff+mL4Y6vx0DqZTi3pkwt/9LlR6JWTVMwZeJp\r
  30         KOSCBVigeZOS3gLVLJLb7IBTvxBh+snSOSAF8F3W/SAJbAZcJyZPnhW5/zu/inXdwgSS\r
  31         OvlXM8mAo0H8RqoUd+kNkWA5s6DeIpBnc5QcrOXuLTDncs6CLlgUsnLSxmiWlfFIr9su\r
  32         3sh7HVmuK1KsLWmVfhv2wIdMvqnPs+dFZ4rpJPNrO/saMzp7ci9LruXm88zDfUFvwo0Y\r
  33         dulLSzDEarKul4xtx+0Rt6RDhUpyPykF1KPnBeO0VxcNXm6o4kM2P+rwtgK5ICQOO06e\r
  34         Fgdw==\r
  35 X-Gm-Message-State:\r
  36  ALoCoQlnorOG5eilzmvt23suEtEumji/LcwwsLudjRNJlN0wPobUgQMLWnDKeILPOAwUJcE9jeWI\r
  37 X-Received: by 10.152.225.70 with SMTP id ri6mr32641415lac.26.1394645167570;\r
  38         Wed, 12 Mar 2014 10:26:07 -0700 (PDT)\r
  39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  40         [88.195.111.91])\r
  41         by mx.google.com with ESMTPSA id u4sm4907707laj.2.2014.03.12.10.26.05\r
  42         for <multiple recipients>\r
  43         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  44         Wed, 12 Mar 2014 10:26:05 -0700 (PDT)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: notmuch@notmuchmail.org\r
  47 Subject: [PATCH v2] test: conditionally test compact depending on configured\r
  48         support\r
  49 Date: Wed, 12 Mar 2014 19:26:04 +0200\r
  50 Message-Id: <1394645164-23561-1-git-send-email-jani@nikula.org>\r
  51 X-Mailer: git-send-email 1.9.0\r
  52 In-Reply-To: <m2mwgwwmfl.fsf@guru.guru-group.fi>\r
  53 References: <m2mwgwwmfl.fsf@guru.guru-group.fi>\r
  54 Cc: Tomi Ollila <tomi.ollila@iki.fi>\r
  55 X-BeenThere: notmuch@notmuchmail.org\r
  56 X-Mailman-Version: 2.1.13\r
  57 Precedence: list\r
  58 List-Id: "Use and development of the notmuch mail system."\r
  59         <notmuch.notmuchmail.org>\r
  60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  61         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  63 List-Post: <mailto:notmuch@notmuchmail.org>\r
  64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  67 X-List-Received-Date: Wed, 12 Mar 2014 17:26:16 -0000\r
  68 \r
  69 I still have one machine with old enough Xapian to not have compaction\r
  70 support. Make the tests check for unsupported compact operation when\r
  71 compact is not available.\r
  72 ---\r
  73  test/Makefile.local  |  8 ++++++++\r
  74  test/T020-compact.sh | 11 +++++++++++\r
  75  2 files changed, 19 insertions(+)\r
  76 \r
  77 diff --git a/test/Makefile.local b/test/Makefile.local\r
  78 index 36b1c1b71de0..781420164105 100644\r
  79 --- a/test/Makefile.local\r
  80 +++ b/test/Makefile.local\r
  81 @@ -35,9 +35,17 @@ $(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)\r
  82  $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o\r
  83         $(call quiet,CC) $^ -o $@\r
  84  \r
  85 +$(dir)/have-compact: Makefile.config\r
  86 +ifeq ($(HAVE_XAPIAN_COMPACT),1)\r
  87 +       ln -sf /bin/true $@\r
  88 +else\r
  89 +       ln -sf /bin/false $@\r
  90 +endif\r
  91 +\r
  92  .PHONY: test check\r
  93  \r
  94  TEST_BINARIES=$(dir)/arg-test \\r
  95 +             $(dir)/have-compact \\r
  96               $(dir)/hex-xcode \\r
  97               $(dir)/random-corpus \\r
  98               $(dir)/parse-time \\r
  99 diff --git a/test/T020-compact.sh b/test/T020-compact.sh\r
 100 index ac174cec7111..77bb9632cb11 100755\r
 101 --- a/test/T020-compact.sh\r
 102 +++ b/test/T020-compact.sh\r
 103 @@ -10,6 +10,17 @@ notmuch tag +tag1 \*\r
 104  notmuch tag +tag2 subject:Two\r
 105  notmuch tag -tag1 +tag3 subject:Three\r
 106  \r
 107 +if ! ${TEST_DIRECTORY}/have-compact; then\r
 108 +    test_begin_subtest "Compact unsupported: error message"\r
 109 +    output=$(notmuch compact --quiet 2>&1)\r
 110 +    test_expect_equal "$output" "notmuch was compiled against a xapian version lacking compaction support.\r
 111 +Compaction failed: Unsupported operation"\r
 112 +\r
 113 +    test_expect_code 1 "Compact unsupported: status code" "notmuch compact"\r
 114 +\r
 115 +    test_done\r
 116 +fi\r
 117 +\r
 118  test_expect_success "Running compact" "notmuch compact --backup=${TEST_DIRECTORY}/xapian.old"\r
 119  \r
 120  test_begin_subtest "Compact preserves database"\r
 121 -- \r
 122 1.9.0\r
 123 \r