1 Return-Path: <tomi.ollila@iki.fi>
\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 arlo.cworth.org (Postfix) with ESMTP id D99576DE0217
\r
6 for <notmuch@notmuchmail.org>; Sat, 7 May 2016 09:03:05 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.601 tagged_above=-999 required=5 tests=[AWL=-0.051,
\r
12 SPF_NEUTRAL=0.652] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id wprfQveglX6y for <notmuch@notmuchmail.org>;
\r
16 Sat, 7 May 2016 09:02:57 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by arlo.cworth.org (Postfix) with ESMTP id 856216DE00EB
\r
19 for <notmuch@notmuchmail.org>; Sat, 7 May 2016 09:02:57 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id C501F100063;
\r
22 Sat, 7 May 2016 19:02:51 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
\r
25 Subject: Re: [Patch v3 03/11] lib/cli: add library API / CLI for compile time
\r
27 In-Reply-To: <1462065879-29860-4-git-send-email-david@tethera.net>
\r
28 References: <1462065879-29860-1-git-send-email-david@tethera.net>
\r
29 <1462065879-29860-4-git-send-email-david@tethera.net>
\r
30 User-Agent: Notmuch/0.22+9~gb26b5ad (http://notmuchmail.org) Emacs/24.3.1
\r
31 (x86_64-unknown-linux-gnu)
\r
32 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
33 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
34 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
35 Date: Sat, 07 May 2016 19:02:51 +0300
\r
36 Message-ID: <m237ptg8k4.fsf@guru.guru-group.fi>
\r
38 Content-Type: text/plain
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.20
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Sat, 07 May 2016 16:03:06 -0000
\r
53 On Sun, May 01 2016, David Bremner <david@tethera.net> wrote:
\r
55 so far so good, (CXXLAGS does not need more mentioning ;)
\r
57 > diff --git a/test/T030-config.sh b/test/T030-config.sh
\r
58 > index f404908..a4e24c3 100755
\r
59 > --- a/test/T030-config.sh
\r
60 > +++ b/test/T030-config.sh
\r
61 > @@ -44,7 +44,7 @@ test_expect_equal "$(notmuch config get foo.nonexistent)" ""
\r
63 > test_begin_subtest "List all items"
\r
64 > notmuch config set database.path "/canonical/path"
\r
65 > -output=$(notmuch config list)
\r
66 > +output=$(notmuch config list | notmuch_options_sanitize)
\r
68 notmuch_built_with_sanitize ? ------/\
\r
70 > test_expect_equal "$output" "\
\r
71 > database.path=/canonical/path
\r
72 > user.name=Notmuch Test Suite
\r
73 > @@ -56,7 +56,9 @@ search.exclude_tags=
\r
74 > maildir.synchronize_flags=true
\r
75 > crypto.gpg_path=gpg
\r
76 > foo.string=this is another string value
\r
77 > -foo.list=this;is another;list value;"
\r
78 > +foo.list=this;is another;list value;
\r
79 > +built_with.compact=something
\r
80 > +built_with.field_processor=something"
\r
82 > test_begin_subtest "Top level --config=FILE option"
\r
83 > cp "${NOTMUCH_CONFIG}" alt-config
\r
84 > diff --git a/test/T040-setup.sh b/test/T040-setup.sh
\r
85 > index cf0c00b..be2f0db 100755
\r
86 > --- a/test/T040-setup.sh
\r
87 > +++ b/test/T040-setup.sh
\r
88 > @@ -19,7 +19,7 @@ another.suite@example.com
\r
92 > -output=$(notmuch --config=new-notmuch-config config list)
\r
93 > +output=$(notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize)
\r
94 > test_expect_equal "$output" "\
\r
95 > database.path=/path/to/maildir
\r
96 > user.name=Test Suite
\r
97 > @@ -29,6 +29,8 @@ new.tags=foo;bar;
\r
99 > search.exclude_tags=baz;
\r
100 > maildir.synchronize_flags=true
\r
101 > -crypto.gpg_path=gpg"
\r
102 > +crypto.gpg_path=gpg
\r
103 > +built_with.compact=something
\r
104 > +built_with.field_processor=something"
\r
107 > diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
108 > index ac04b15..09f8731 100644
\r
109 > --- a/test/test-lib.sh
\r
110 > +++ b/test/test-lib.sh
\r
111 > @@ -733,6 +733,12 @@ notmuch_uuid_sanitize ()
\r
113 > sed 's/[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/UUID/g'
\r
116 > +notmuch_built_with_sanitize ()
\r
118 > + sed 's/^built_with[.]\(.*\)=.*$/built_with.\1=something/'
\r
121 The above looks good. In this case I think this would work too
\r
123 sed '/^built_with/ s/=.*/=something/'
\r
125 hmm. simpler, but less educational ;)
\r
132 > # End of notmuch helper functions
\r
134 > # Use test_set_prereq to tell that a particular prerequisite is available.
\r