Re: [PATCH v2] test: expand regex in test/basic

diff --git a/50/64717a32fc871d63415f9bc6c0e96b166964a6 b/50/64717a32fc871d63415f9bc6c0e96b166964a6
new file mode 100644 (file)
index 0000000..5d5fa83
--- /dev/null
+++ b/50/64717a32fc871d63415f9bc6c0e96b166964a6
@@ -0,0 +1,102 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3FC64431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Nov 2012 05:28:26 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id p6MAgXJMDyE7 for <notmuch@notmuchmail.org>;\r
+       Thu, 15 Nov 2012 05:28:24 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 72B77431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Nov 2012 05:28:24 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 9C8A01000E2;\r
+       Thu, 15 Nov 2012 15:28:22 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] test: expand regex in test/basic\r
+In-Reply-To: <1352943054-930-1-git-send-email-david@tethera.net>\r
+References: <m2haoxmctu.fsf@guru.guru-group.fi>\r
+       <1352943054-930-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+84~g8a199bf (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Thu, 15 Nov 2012 15:28:22 +0200\r
+Message-ID: <m21ufvm1vt.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 15 Nov 2012 13:28:26 -0000\r
+\r
+On Thu, Nov 15 2012, david@tethera.net wrote:\r
+\r
+> From: David Bremner <bremner@debian.org>\r
+>\r
+> Over time, maintaining this very long regex has become irritating,\r
+> especially when resolving conflicts.\r
+>\r
+> This patch replaces the call to sed with multiple extra arguments to\r
+> find.  Since each test binary is now on it's own line, this should\r
+> make resolving conflicts easier.\r
+\r
+LGTM. Works. +1\r
+\r
+Tomi\r
+\r
+\r
+> ---\r
+>  test/basic |   12 +++++++++---\r
+>  1 file changed, 9 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/test/basic b/test/basic\r
+> index c47197c..1b842d2 100755\r
+> --- a/test/basic\r
+> +++ b/test/basic\r
+> @@ -53,9 +53,15 @@ test_expect_code 2 'failure to clean up causes the test to fail' '\r
+>  test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'\r
+>  eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)\r
+>  tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)\r
+> -available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \\r
+> -    sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \\r
+> -    sort)\r
+> +available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111  \\r
+> +    ! -name aggregate-results.sh    \\r
+> +    ! -name arg-test                        \\r
+> +    ! -name notmuch-test            \\r
+> +    ! -name parse-time                      \\r
+> +    ! -name smtp-dummy                      \\r
+> +    ! -name symbol-test                     \\r
+> +    ! -name test-verbose            \\r
+> +    | sed 's,.*/,,' | sort)\r
+>  test_expect_equal "$tests_in_suite" "$available"\r
+>  \r
+>  EXPECTED=$TEST_DIRECTORY/test.expected-output\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r