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

diff --git a/f4/6d3a8d1ddb4764bdbb36421cd282909d9b9d8b b/f4/6d3a8d1ddb4764bdbb36421cd282909d9b9d8b
new file mode 100644 (file)
index 0000000..d98e391
--- /dev/null
+++ b/f4/6d3a8d1ddb4764bdbb36421cd282909d9b9d8b
@@ -0,0 +1,92 @@
+Return-Path: <bremner@tethera.net>\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 771E5431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 17:31:13 -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 rMVw0BnC8Bij for <notmuch@notmuchmail.org>;\r
+       Wed, 14 Nov 2012 17:31:12 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D5B37431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 17:31:12 -0800 (PST)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TYoIP-0007YJ-Ap; Wed, 14 Nov 2012 21:31:09 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TYoIJ-0000GC-Hk; Wed, 14 Nov 2012 21:31:03 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] test: expand regex in test/basic\r
+Date: Wed, 14 Nov 2012 21:30:54 -0400\r
+Message-Id: <1352943054-930-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <m2haoxmctu.fsf@guru.guru-group.fi>\r
+References: <m2haoxmctu.fsf@guru.guru-group.fi>\r
+X-Spam_bar: -\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 01:31:13 -0000\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
+ 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