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 EDF4540DEF6 for ; Wed, 17 Nov 2010 11:32:33 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5 tests=[BAYES_00=-1.9] autolearn=ham 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 AEujEi+T0tFx for ; Wed, 17 Nov 2010 11:32:23 -0800 (PST) X-Greylist: delayed 300 seconds by postgrey-1.32 at olra; Wed, 17 Nov 2010 11:32:23 PST Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU [18.9.25.13]) by olra.theworths.org (Postfix) with ESMTP id B732940DEF4 for ; Wed, 17 Nov 2010 11:32:23 -0800 (PST) X-AuditID: 1209190d-b7cacae000000a14-c2-4ce42c9a4d4b Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) by dmz-mailsec-scanner-2.mit.edu (Symantec Brightmail Gateway) with SMTP id DF.24.02580.A9C24EC4; Wed, 17 Nov 2010 14:27:22 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id oAHJRLA3018183 for ; Wed, 17 Nov 2010 14:27:22 -0500 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id oAHJRKkG007352 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 17 Nov 2010 14:27:21 -0500 (EST) Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.72) (envelope-from ) id 1PInf6-0001Dz-Mu for notmuch@notmuchmail.org; Wed, 17 Nov 2010 14:27:20 -0500 Date: Wed, 17 Nov 2010 14:27:20 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 1/4] Fix handling of broken tests. Message-ID: <20101117192720.GS2439@mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Brightmail-Tracker: AAAAAA== 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: Wed, 17 Nov 2010 19:32:34 -0000 Make sure to close the subtest for test_expect_equal_failure, just like in test_expect_equal. --- test/test-lib.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) mode change 100644 => 100755 test/test-lib.sh diff --git a/test/test-lib.sh b/test/test-lib.sh old mode 100644 new mode 100755 index 04a4c14..da91de8 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -440,6 +440,8 @@ test_expect_equal () test_expect_equal_failure () { + exec 1>&6 2>&7 # Restore stdout and stderr + inside_subtest= test "$#" = 3 && { prereq=$1; shift; } || prereq= test "$#" = 2 || error "bug in the test script: not 2 or 3 parameters to test_expect_equal" -- 1.7.2.3