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 9FA62431FC3
\r
6 for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:15 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 zjtfcbMfDk87 for <notmuch@notmuchmail.org>;
\r
16 Fri, 30 May 2014 00:43:11 -0700 (PDT)
\r
17 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com
\r
18 [209.85.212.176]) (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 E50D1431FBD
\r
21 for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:10 -0700 (PDT)
\r
22 Received: by mail-wi0-f176.google.com with SMTP id n15so593036wiw.3
\r
23 for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:09 -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
28 bh=lp8K2qD2ZX6CKrreJE46A+y6mKpTB3npUr4hw8aVKTA=;
\r
29 b=CWfiS5+jM3T1l8h4ioFJ8+H9WD94GjBpMnR2p6s+968Q6TyHqJp20XVfJ6ddZTrwCV
\r
30 DZOboy45dig8lOj95W4XrzW5A2NrkQ/jz7APuOzMy29cFtoSnZdyE/69+ZlXgtO9qAnQ
\r
31 +xs3iD0coDqvcOiiAmpkTvMTr9KQBvHMqeCOJg9DG3bpG49xt4J+4NF2Le1etAGRHQfG
\r
32 Iy74GQunWEBQWfS+AaUkhz7sET0WTLCZtCivFDDkMD1aALS3I/E1fAO+I0v3vOp+uzB3
\r
33 VwyH2LOIwJZzuf7OnjPO+rwPnI0phYh3BY46yzN/lJelKwQ6QmR02I0qnBoex6ZLWAft
\r
36 ALoCoQmTofDgxmBwM2qCCdNq8ExK5/gK3NKUsz97AvW3L9sYZ3ZbMCunUInsmsWachwevKPJ8oFk
\r
37 X-Received: by 10.180.74.203 with SMTP id w11mr3873223wiv.27.1401435789693;
\r
38 Fri, 30 May 2014 00:43:09 -0700 (PDT)
\r
39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
\r
40 [88.195.111.91]) by mx.google.com with ESMTPSA id
\r
41 ch16sm7990218wjb.43.2014.05.30.00.43.08 for <multiple recipients>
\r
42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
43 Fri, 30 May 2014 00:43:09 -0700 (PDT)
\r
44 From: Jani Nikula <jani@nikula.org>
\r
45 To: notmuch@notmuchmail.org
\r
46 Subject: [PATCH 2/2] test: use sh.config for configuration
\r
47 Date: Fri, 30 May 2014 10:43:05 +0300
\r
48 Message-Id: <1401435785-2894-2-git-send-email-jani@nikula.org>
\r
49 X-Mailer: git-send-email 2.0.0.rc2
\r
50 In-Reply-To: <1401435785-2894-1-git-send-email-jani@nikula.org>
\r
51 References: <m2lhtphn1b.fsf@guru.guru-group.fi>
\r
52 <1401435785-2894-1-git-send-email-jani@nikula.org>
\r
53 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
54 X-BeenThere: notmuch@notmuchmail.org
\r
55 X-Mailman-Version: 2.1.13
\r
57 List-Id: "Use and development of the notmuch mail system."
\r
58 <notmuch.notmuchmail.org>
\r
59 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
61 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
62 List-Post: <mailto:notmuch@notmuchmail.org>
\r
63 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
64 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
66 X-List-Received-Date: Fri, 30 May 2014 07:43:15 -0000
\r
69 test/.gitignore | 2 --
\r
70 test/Makefile.local | 16 ----------------
\r
71 test/T010-help-test.sh | 2 +-
\r
72 test/T020-compact.sh | 2 +-
\r
73 test/test-lib-common.sh | 4 ++++
\r
74 5 files changed, 6 insertions(+), 20 deletions(-)
\r
76 diff --git a/test/.gitignore b/test/.gitignore
\r
77 index 4081cee6da18..b3b706d85188 100644
\r
78 --- a/test/.gitignore
\r
79 +++ b/test/.gitignore
\r
88 diff --git a/test/Makefile.local b/test/Makefile.local
\r
89 index d622eafee786..1c85b18adc41 100644
\r
90 --- a/test/Makefile.local
\r
91 +++ b/test/Makefile.local
\r
92 @@ -35,25 +35,9 @@ $(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)
\r
93 $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o
\r
94 $(call quiet,CC) $^ -o $@
\r
96 -$(dir)/have-compact: Makefile.config
\r
97 -ifeq ($(HAVE_XAPIAN_COMPACT),1)
\r
98 - ln -sf /bin/true $@
\r
100 - ln -sf /bin/false $@
\r
103 -$(dir)/have-man: Makefile.config
\r
104 -ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)
\r
105 - ln -sf /bin/false $@
\r
107 - ln -sf /bin/true $@
\r
112 TEST_BINARIES=$(dir)/arg-test \
\r
113 - $(dir)/have-compact \
\r
114 - $(dir)/have-man \
\r
116 $(dir)/random-corpus \
\r
117 $(dir)/parse-time \
\r
118 diff --git a/test/T010-help-test.sh b/test/T010-help-test.sh
\r
119 index 77410bc54e66..f0ca4549dc8b 100755
\r
120 --- a/test/T010-help-test.sh
\r
121 +++ b/test/T010-help-test.sh
\r
122 @@ -7,7 +7,7 @@ test_expect_success 'notmuch --help' 'notmuch --help'
\r
123 test_expect_success 'notmuch help' 'notmuch help'
\r
124 test_expect_success 'notmuch --version' 'notmuch --version'
\r
126 -if ${TEST_DIRECTORY}/have-man; then
\r
127 +if [ $_HAVE_MAN -eq 1 ]; then
\r
128 test_expect_success 'notmuch --help tag' 'notmuch --help tag'
\r
129 test_expect_success 'notmuch help tag' 'notmuch help tag'
\r
131 diff --git a/test/T020-compact.sh b/test/T020-compact.sh
\r
132 index 77bb9632cb11..19d81c5fc77d 100755
\r
133 --- a/test/T020-compact.sh
\r
134 +++ b/test/T020-compact.sh
\r
135 @@ -10,7 +10,7 @@ notmuch tag +tag1 \*
\r
136 notmuch tag +tag2 subject:Two
\r
137 notmuch tag -tag1 +tag3 subject:Three
\r
139 -if ! ${TEST_DIRECTORY}/have-compact; then
\r
140 +if [ $_HAVE_XAPIAN_COMPACT -eq 0 ]; then
\r
141 test_begin_subtest "Compact unsupported: error message"
\r
142 output=$(notmuch compact --quiet 2>&1)
\r
143 test_expect_equal "$output" "notmuch was compiled against a xapian version lacking compaction support.
\r
144 diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
\r
145 index 892991e2bd03..4903038dd9ce 100644
\r
146 --- a/test/test-lib-common.sh
\r
147 +++ b/test/test-lib-common.sh
\r
148 @@ -38,6 +38,10 @@ find_notmuch_path ()
\r
149 # test/ subdirectory and are run in 'trash directory' subdirectory.
\r
150 TEST_DIRECTORY=$(pwd)
\r
151 notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
\r
153 +# configure output
\r
154 +. $notmuch_path/sh.config
\r
156 if test -n "$valgrind"
\r