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 81BEF429E21 for ; Mon, 28 Nov 2011 14:41:52 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 2vLGTKUP8I-m for ; Mon, 28 Nov 2011 14:41:52 -0800 (PST) Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id F1DB6431FB6 for ; Mon, 28 Nov 2011 14:41:51 -0800 (PST) Received: by mail-bw0-f53.google.com with SMTP id q10so9985561bka.26 for ; Mon, 28 Nov 2011 14:41:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=/lS5spadxFEEKdIf0jfk5V6+MNArtU+6vld0L8zjInQ=; b=MpPxaHThQEJWZ5m30EhdzjYnyhSK9qIbpXXkYQPqg5NudQt3Z09ehfFk7Pdx9gcC9w 7w64Djx5EBN0+fZ7z6FhbebBMwbHTCzMKmrDXXTF3qoKofGd63ai9DaAmxrtVAAXRryt h5KTJvaCfTRXc8iYEPpibBTebX+3lMBKQDalU= Received: by 10.204.136.214 with SMTP id s22mr14883495bkt.136.1322520111658; Mon, 28 Nov 2011 14:41:51 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id l5sm29294407bkv.9.2011.11.28.14.41.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Nov 2011 14:41:50 -0800 (PST) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH 4/4] test: fix error messages for missing binary dependencies Date: Tue, 29 Nov 2011 02:41:07 +0400 Message-Id: <1322520067-15227-5-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1322520067-15227-1-git-send-email-dmitry.kurochkin@gmail.com> References: <1322520067-15227-1-git-send-email-dmitry.kurochkin@gmail.com> 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: Mon, 28 Nov 2011 22:41:52 -0000 The fake missing binary functions check if the binary has already be added to the diagnostic message to avoid duplicates. Unfortunately, this check was buggy because the message string does not have the trailing space. --- test/test-lib.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index 2861d88..a975957 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -556,7 +556,7 @@ test_declare_external_prereq () { hash $binary 2>/dev/null || eval " test_missing_external_prereq_${binary}_=t $binary () { - echo -n \"\$test_subtest_missing_external_prereqs_\" | grep -qe \" $name \" || + echo -n \"\$test_subtest_missing_external_prereqs_ \" | grep -qe \" $name \" || test_subtest_missing_external_prereqs_=\"\$test_subtest_missing_external_prereqs_ $name\" false }" -- 1.7.7.3