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 6AE44429E21 for ; Mon, 28 Nov 2011 14:41:45 -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 cN1cNih1O8e6 for ; Mon, 28 Nov 2011 14:41:45 -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 CC21B431FB6 for ; Mon, 28 Nov 2011 14:41:44 -0800 (PST) Received: by mail-bw0-f53.google.com with SMTP id q10so9985561bka.26 for ; Mon, 28 Nov 2011 14:41:44 -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=o/JPST/SR0wUpQ/i3oUWeD3K1c5xtgHb2tHLLdCSRHo=; b=BFXxkRBtPVTrzkA1qyrr8behb7jHwWa3fpbRlscoHqP0acetrSUhFYCRKU3FfnBzMI Lvy1PyBYN1Fa82RJwYzMM1HNd1ZzV7qDcFh0RaOP2quuaC6Yo+Il9twrvLldns+S/JaP 0EfnC7SrGWdwKj91GKy/9OM4nfZMIVF0k2jZY= Received: by 10.205.139.11 with SMTP id iu11mr22155606bkc.82.1322520104483; Mon, 28 Nov 2011 14:41:44 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id cc2sm32778231bkb.8.2011.11.28.14.41.43 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Nov 2011 14:41:43 -0800 (PST) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH 1/4] test: fix test_require_external_prereq() Date: Tue, 29 Nov 2011 02:41:04 +0400 Message-Id: <1322520067-15227-2-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:45 -0000 test_missing_external_prereq_${binary}_ variable indicates that the binary is missing. It must be set in test_declare_external_prereq() outside of the fake $binary() function. --- 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 11e6646..d7282ff 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -554,8 +554,8 @@ test_declare_external_prereq () { test "$#" = 2 && name=$2 || name="$binary(1)" hash $binary 2>/dev/null || eval " -$binary () { test_missing_external_prereq_${binary}_=t +$binary () { echo -n \"\$test_subtest_missing_external_prereqs_\" | grep -e \" $name \" || test_subtest_missing_external_prereqs_=\"$test_subtest_missing_external_prereqs_ $name\" false -- 1.7.7.3