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 olra.theworths.org (Postfix) with ESMTP id 3FC64431FAF
\r
6 for <notmuch@notmuchmail.org>; Thu, 15 Nov 2012 05:28:26 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 p6MAgXJMDyE7 for <notmuch@notmuchmail.org>;
\r
16 Thu, 15 Nov 2012 05:28:24 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 72B77431FAE
\r
19 for <notmuch@notmuchmail.org>; Thu, 15 Nov 2012 05:28:24 -0800 (PST)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 9C8A01000E2;
\r
22 Thu, 15 Nov 2012 15:28:22 +0200 (EET)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: david@tethera.net, notmuch@notmuchmail.org
\r
25 Subject: Re: [PATCH v2] test: expand regex in test/basic
\r
26 In-Reply-To: <1352943054-930-1-git-send-email-david@tethera.net>
\r
27 References: <m2haoxmctu.fsf@guru.guru-group.fi>
\r
28 <1352943054-930-1-git-send-email-david@tethera.net>
\r
29 User-Agent: Notmuch/0.14+84~g8a199bf (http://notmuchmail.org) Emacs/24.2.1
\r
30 (x86_64-unknown-linux-gnu)
\r
31 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
32 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
33 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
34 Date: Thu, 15 Nov 2012 15:28:22 +0200
\r
35 Message-ID: <m21ufvm1vt.fsf@guru.guru-group.fi>
\r
37 Content-Type: text/plain
\r
38 Cc: David Bremner <bremner@debian.org>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Thu, 15 Nov 2012 13:28:26 -0000
\r
53 On Thu, Nov 15 2012, david@tethera.net wrote:
\r
55 > From: David Bremner <bremner@debian.org>
\r
57 > Over time, maintaining this very long regex has become irritating,
\r
58 > especially when resolving conflicts.
\r
60 > This patch replaces the call to sed with multiple extra arguments to
\r
61 > find. Since each test binary is now on it's own line, this should
\r
62 > make resolving conflicts easier.
\r
70 > test/basic | 12 +++++++++---
\r
71 > 1 file changed, 9 insertions(+), 3 deletions(-)
\r
73 > diff --git a/test/basic b/test/basic
\r
74 > index c47197c..1b842d2 100755
\r
77 > @@ -53,9 +53,15 @@ test_expect_code 2 'failure to clean up causes the test to fail' '
\r
78 > test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'
\r
79 > eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)
\r
80 > tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
\r
81 > -available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \
\r
82 > - sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \
\r
84 > +available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 \
\r
85 > + ! -name aggregate-results.sh \
\r
86 > + ! -name arg-test \
\r
87 > + ! -name notmuch-test \
\r
88 > + ! -name parse-time \
\r
89 > + ! -name smtp-dummy \
\r
90 > + ! -name symbol-test \
\r
91 > + ! -name test-verbose \
\r
92 > + | sed 's,.*/,,' | sort)
\r
93 > test_expect_equal "$tests_in_suite" "$available"
\r
95 > EXPECTED=$TEST_DIRECTORY/test.expected-output
\r
99 > _______________________________________________
\r
100 > notmuch mailing list
\r
101 > notmuch@notmuchmail.org
\r
102 > http://notmuchmail.org/mailman/listinfo/notmuch
\r