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