1 Return-Path: <aidecoe@aidecoe.name>
\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 DEF2A431FD0
\r
6 for <notmuch@notmuchmail.org>; Fri, 25 Nov 2011 01:52:27 -0800 (PST)
\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 1HOPIhlYNMAO for <notmuch@notmuchmail.org>;
\r
16 Fri, 25 Nov 2011 01:52:26 -0800 (PST)
\r
17 Received: from mail-ey0-f181.google.com (mail-ey0-f181.google.com
\r
18 [209.85.215.181]) (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 6ADC1431FB6
\r
21 for <notmuch@notmuchmail.org>; Fri, 25 Nov 2011 01:52:26 -0800 (PST)
\r
22 Received: by eaah13 with SMTP id h13so783955eaa.26
\r
23 for <notmuch@notmuchmail.org>; Fri, 25 Nov 2011 01:52:23 -0800 (PST)
\r
24 Received: by 10.213.3.209 with SMTP id 17mr2582259ebo.116.1322214743675;
\r
25 Fri, 25 Nov 2011 01:52:23 -0800 (PST)
\r
26 Received: from localhost (abtw56.neoplus.adsl.tpnet.pl. [83.8.168.56])
\r
27 by mx.google.com with ESMTPS id e6sm2794343fah.0.2011.11.25.01.52.18
\r
28 (version=TLSv1/SSLv3 cipher=OTHER);
\r
29 Fri, 25 Nov 2011 01:52:19 -0800 (PST)
\r
30 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
\r
31 To: notmuch@notmuchmail.org
\r
32 Subject: [PATCH] Build symbol-test with make a not manually in symbol-hiding.
\r
33 Date: Fri, 25 Nov 2011 10:52:16 +0100
\r
34 Message-Id: <1322214736-31335-1-git-send-email-aidecoe@aidecoe.name>
\r
35 X-Mailer: git-send-email 1.7.8.rc3
\r
36 Cc: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
\r
37 X-BeenThere: notmuch@notmuchmail.org
\r
38 X-Mailman-Version: 2.1.13
\r
40 List-Id: "Use and development of the notmuch mail system."
\r
41 <notmuch.notmuchmail.org>
\r
42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
45 List-Post: <mailto:notmuch@notmuchmail.org>
\r
46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
49 X-List-Received-Date: Fri, 25 Nov 2011 09:52:28 -0000
\r
51 Fixed warnings in symbol-test.cc, btw.
\r
53 test/.gitignore | 1 +
\r
54 test/Makefile.local | 5 ++++-
\r
56 test/symbol-hiding | 3 +--
\r
57 test/symbol-test.cc | 9 ++++-----
\r
58 5 files changed, 11 insertions(+), 9 deletions(-)
\r
60 diff --git a/test/.gitignore b/test/.gitignore
\r
61 index 9e97052..7e30e8d 100644
\r
62 --- a/test/.gitignore
\r
63 +++ b/test/.gitignore
\r
70 diff --git a/test/Makefile.local b/test/Makefile.local
\r
71 index 8eb0433..a672fd3 100644
\r
72 --- a/test/Makefile.local
\r
73 +++ b/test/Makefile.local
\r
74 @@ -11,8 +11,11 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
\r
75 $(dir)/smtp-dummy: $(smtp_dummy_modules)
\r
76 $(call quiet,CC) $^ -o $@
\r
78 +$(dir)/symbol-test: $(dir)/symbol-test.o
\r
79 + $(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian
\r
82 -test: all $(dir)/smtp-dummy
\r
83 +test: all $(dir)/smtp-dummy $(dir)/symbol-test
\r
84 @${dir}/notmuch-test $(OPTIONS)
\r
87 diff --git a/test/basic b/test/basic
\r
88 index 38db2ba..5463bf8 100755
\r
91 @@ -56,7 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
\r
92 available=$(ls -1 $TEST_DIRECTORY/ | \
\r
93 sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \
\r
94 -e "/^(README|test-lib.sh|test-lib.el|test-results|tmp.*|valgrind|corpus*)/d" \
\r
95 - -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc)/d" \
\r
96 + -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc|symbol-test|symbol-test.o)/d" \
\r
97 -e "/^(test.expected-output|.*~)/d" \
\r
98 -e "/^(gnupg-secret-key.asc)/d" \
\r
99 -e "/^(gnupg-secret-key.NOTE)/d" \
\r
100 diff --git a/test/symbol-hiding b/test/symbol-hiding
\r
101 index d0b31ae..f67b653 100755
\r
102 --- a/test/symbol-hiding
\r
103 +++ b/test/symbol-hiding
\r
104 @@ -12,13 +12,12 @@ test_description='exception symbol hiding'
\r
108 - result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib ./symbol-test 2>&1)
\r
109 + result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1)
\r
112 output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'
\r
113 caught No chert database found at path \`./nonexistant'"
\r
115 -g++ -o symbol-test -I$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test.cc -L$TEST_DIRECTORY/../lib -lnotmuch -lxapian
\r
116 mkdir -p fakedb/.notmuch
\r
117 test_expect_success 'running test' run_test
\r
118 test_begin_subtest 'checking output'
\r
119 diff --git a/test/symbol-test.cc b/test/symbol-test.cc
\r
120 index 1de06ea..bfbe38f 100644
\r
121 --- a/test/symbol-test.cc
\r
122 +++ b/test/symbol-test.cc
\r
125 #include <xapian.h>
\r
126 #include <notmuch.h>
\r
127 -main (int argc, char **argv){
\r
130 - notmuch_database_t *notmuch
\r
131 - = notmuch_database_open ("fakedb",
\r
132 - NOTMUCH_DATABASE_MODE_READ_ONLY);
\r
133 + //notmuch_database_t *notmuch =
\r
134 + notmuch_database_open ("fakedb", NOTMUCH_DATABASE_MODE_READ_ONLY);
\r
137 - (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN);
\r
138 + (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN);
\r
139 } catch (const Xapian::Error &error) {
\r
140 printf("caught %s\n",error.get_msg().c_str());
\r