1 Return-Path: <dmitry.kurochkin@gmail.com>
\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 B0DE5429E25
\r
6 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:25:35 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id UU6APwLUROAn for <notmuch@notmuchmail.org>;
\r
17 Sun, 27 Nov 2011 10:25:34 -0800 (PST)
\r
18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com
\r
19 [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id E0944431FB6
\r
22 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:25:33 -0800 (PST)
\r
23 Received: by bkaq10 with SMTP id q10so7992639bka.26
\r
24 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:25:32 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:subject:in-reply-to:references:user-agent:date:message-id
\r
27 :mime-version:content-type:content-transfer-encoding;
\r
28 bh=KCFIRINXOLBAUiNfbtW2TXiKsrvIHu8B8rwlM4fA5jI=;
\r
29 b=bgizljATISGxGl77OHTMgDHCWfVGwd+kTZmtBn4JHqBKPTcFK5eaM5mW2KyVf/TE7c
\r
30 Xqbv5ro8TULUpzdmEbVOV0t8rWu2bjSw4Llcap1iGaNMkA3cp9dNwgLcN9lHQByxgo5N
\r
31 w4QWHCj4zW2HleLHt4OtEciZrCA+07Lua2iGQ=
\r
32 Received: by 10.204.154.201 with SMTP id p9mr42846448bkw.33.1322418332318;
\r
33 Sun, 27 Nov 2011 10:25:32 -0800 (PST)
\r
34 Received: from localhost ([91.144.186.21])
\r
35 by mx.google.com with ESMTPS id e18sm25063704bkr.15.2011.11.27.10.25.30
\r
36 (version=TLSv1/SSLv3 cipher=OTHER);
\r
37 Sun, 27 Nov 2011 10:25:30 -0800 (PST)
\r
38 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
39 To: Amadeusz =?utf-8?B?xbtvxYJub3dza2k=?= <aidecoe@aidecoe.name>,
\r
40 notmuch@notmuchmail.org
\r
41 Subject: Re: [PATCH] Build symbol-test with make instead of hardcoding in
\r
43 In-Reply-To: <1322342060-967-1-git-send-email-aidecoe@aidecoe.name>
\r
44 References: <1322341843-sup-9963@raeviah>
\r
45 <1322342060-967-1-git-send-email-aidecoe@aidecoe.name>
\r
46 User-Agent: Notmuch/0.10+25~g1a9cfbd (http://notmuchmail.org) Emacs/23.3.1
\r
47 (x86_64-pc-linux-gnu)
\r
48 Date: Sun, 27 Nov 2011 22:25:09 +0400
\r
49 Message-ID: <87vcq5e83e.fsf@gmail.com>
\r
51 Content-Type: text/plain; charset=utf-8
\r
52 Content-Transfer-Encoding: quoted-printable
\r
53 X-BeenThere: notmuch@notmuchmail.org
\r
54 X-Mailman-Version: 2.1.13
\r
56 List-Id: "Use and development of the notmuch mail system."
\r
57 <notmuch.notmuchmail.org>
\r
58 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
60 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
61 List-Post: <mailto:notmuch@notmuchmail.org>
\r
62 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
63 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
65 X-List-Received-Date: Sun, 27 Nov 2011 18:25:35 -0000
\r
67 On Sat, 26 Nov 2011 22:14:20 +0100, Amadeusz =C5=BBo=C5=82nowski <aidecoe@a=
\r
69 > If symbol-test is built in symbol-hiding with hardcoded g++ invokation,
\r
70 > it's not so easy to pass $(srcdir) which is required to find notmuch.h
\r
71 > when srcdir and builddir are separate directories.
\r
73 > test/.gitignore | 1 +
\r
74 > test/Makefile.local | 7 +++++--
\r
76 > test/symbol-hiding | 3 +--
\r
77 > 4 files changed, 8 insertions(+), 5 deletions(-)
\r
79 > diff --git a/test/.gitignore b/test/.gitignore
\r
80 > index 9e97052..7e30e8d 100644
\r
81 > --- a/test/.gitignore
\r
82 > +++ b/test/.gitignore
\r
89 > diff --git a/test/Makefile.local b/test/Makefile.local
\r
90 > index 9b3308a..646779e 100644
\r
91 > --- a/test/Makefile.local
\r
92 > +++ b/test/Makefile.local
\r
93 > @@ -11,10 +11,13 @@ smtp_dummy_modules =3D $(smtp_dummy_srcs:.c=3D.o)
\r
94 > $(dir)/smtp-dummy: $(smtp_dummy_modules)
\r
95 > $(call quiet,CC) $^ -o $@
\r
97 > +$(dir)/symbol-test: $(dir)/symbol-test.o
\r
98 > + $(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian
\r
100 > .PHONY: test check
\r
101 > -test: all $(dir)/smtp-dummy
\r
102 > +test: all $(dir)/smtp-dummy $(dir)/symbol-test
\r
103 > @${dir}/notmuch-test $(OPTIONS)
\r
107 > -CLEAN :=3D $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o
\r
108 > +CLEAN :=3D $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o $(dir)/symbol-=
\r
109 test $(dir)/symbol-test.o
\r
110 > diff --git a/test/basic b/test/basic
\r
111 > index f258d1f..4edf831 100755
\r
114 > @@ -54,7 +54,7 @@ test_begin_subtest 'Ensure that all available tests wil=
\r
115 l be run by notmuch-test'
\r
116 > eval $(sed -n -e '/^TESTS=3D"$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)
\r
117 > tests_in_suite=3D$(for i in $TESTS; do echo $i; done | sort)
\r
118 > available=3D$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -executable -pr=
\r
120 > - sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verb=
\r
122 > + sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verb=
\r
123 ose|symbol-test)$/d" | \
\r
125 Can you please keep this list alphabetically sorted?
\r
131 > test_expect_equal "$tests_in_suite" "$available"
\r
133 > diff --git a/test/symbol-hiding b/test/symbol-hiding
\r
134 > index d0b31ae..f67b653 100755
\r
135 > --- a/test/symbol-hiding
\r
136 > +++ b/test/symbol-hiding
\r
137 > @@ -12,13 +12,12 @@ test_description=3D'exception symbol hiding'
\r
141 > - result=3D$(LD_LIBRARY_PATH=3D$TEST_DIRECTORY/../lib ./symbol-test 2>=
\r
143 > + result=3D$(LD_LIBRARY_PATH=3D$TEST_DIRECTORY/../lib $TEST_DIRECTORY/=
\r
147 > output=3D"A Xapian exception occurred opening database: Couldn't stat 'f=
\r
148 akedb/.notmuch/xapian'
\r
149 > caught No chert database found at path \`./nonexistant'"
\r
151 > -g++ -o symbol-test -I$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test.=
\r
152 cc -L$TEST_DIRECTORY/../lib -lnotmuch -lxapian
\r
153 > mkdir -p fakedb/.notmuch
\r
154 > test_expect_success 'running test' run_test
\r
155 > test_begin_subtest 'checking output'
\r
159 > _______________________________________________
\r
160 > notmuch mailing list
\r
161 > notmuch@notmuchmail.org
\r
162 > http://notmuchmail.org/mailman/listinfo/notmuch
\r