From a2756e9d64df45e60236e9380737860a55cca31f Mon Sep 17 00:00:00 2001 From: david Date: Sun, 11 Nov 2012 15:31:07 +2000 Subject: [PATCH] [PATCH] test: expand regex in test/basic --- e5/7eec0ad59a28b8c522edabcaa45d3a8a0e60da | 94 +++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 e5/7eec0ad59a28b8c522edabcaa45d3a8a0e60da diff --git a/e5/7eec0ad59a28b8c522edabcaa45d3a8a0e60da b/e5/7eec0ad59a28b8c522edabcaa45d3a8a0e60da new file mode 100644 index 000000000..57467dda6 --- /dev/null +++ b/e5/7eec0ad59a28b8c522edabcaa45d3a8a0e60da @@ -0,0 +1,94 @@ +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 DB538431FB6 + for ; Sat, 10 Nov 2012 11:31:58 -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 WVNG4S1xImDF for ; + Sat, 10 Nov 2012 11:31:57 -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 88126431FAF + for ; Sat, 10 Nov 2012 11:31:57 -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 1TXGma-0002fv-Eo; Sat, 10 Nov 2012 15:31:56 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TXGmA-0003BR-TR; Sat, 10 Nov 2012 15:31:30 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH] test: expand regex in test/basic +Date: Sat, 10 Nov 2012 15:31:07 -0400 +Message-Id: <1352575867-12157-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +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: Sat, 10 Nov 2012 19:31:59 -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. + +The use of basename is clunky, but at least is portable (unlike the +printf option to find) +--- + test/basic | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/test/basic b/test/basic +index c47197c..7420c7d 100755 +--- a/test/basic ++++ b/test/basic +@@ -53,8 +53,17 @@ 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" | \ ++ ++ ++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 \ ++ -exec basename {} \; | \ + sort) + test_expect_equal "$tests_in_suite" "$available" + +-- +1.7.10.4 + -- 2.26.2