From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 771E5431FBC for ; Wed, 14 Nov 2012 17:31:13 -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 rMVw0BnC8Bij for ; Wed, 14 Nov 2012 17:31:12 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id D5B37431FAF for ; Wed, 14 Nov 2012 17:31:12 -0800 (PST) Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net ([156.34.89.108] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TYoIP-0007YJ-Ap; Wed, 14 Nov 2012 21:31:09 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TYoIJ-0000GC-Hk; Wed, 14 Nov 2012 21:31:03 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH v2] test: expand regex in test/basic Date: Wed, 14 Nov 2012 21:30:54 -0400 Message-Id: <1352943054-930-1-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-Spam_bar: - 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 01:31:13 -0000 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. --- 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