[PATCH 1/4] test: fix test_require_external_prereq()

diff --git a/b0/391cefe713c798ea84494e2f9967f11b7e5bb1 b/b0/391cefe713c798ea84494e2f9967f11b7e5bb1
new file mode 100644 (file)
index 0000000..a88abb1
--- /dev/null
+++ b/b0/391cefe713c798ea84494e2f9967f11b7e5bb1
@@ -0,0 +1,82 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6AE44429E21\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Nov 2011 14:41:45 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id cN1cNih1O8e6 for <notmuch@notmuchmail.org>;\r
+       Mon, 28 Nov 2011 14:41:45 -0800 (PST)\r
+Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CC21B431FB6\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Nov 2011 14:41:44 -0800 (PST)\r
+Received: by mail-bw0-f53.google.com with SMTP id q10so9985561bka.26\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Nov 2011 14:41:44 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=o/JPST/SR0wUpQ/i3oUWeD3K1c5xtgHb2tHLLdCSRHo=;\r
+       b=BFXxkRBtPVTrzkA1qyrr8behb7jHwWa3fpbRlscoHqP0acetrSUhFYCRKU3FfnBzMI\r
+       Lvy1PyBYN1Fa82RJwYzMM1HNd1ZzV7qDcFh0RaOP2quuaC6Yo+Il9twrvLldns+S/JaP\r
+       0EfnC7SrGWdwKj91GKy/9OM4nfZMIVF0k2jZY=\r
+Received: by 10.205.139.11 with SMTP id iu11mr22155606bkc.82.1322520104483;\r
+       Mon, 28 Nov 2011 14:41:44 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id cc2sm32778231bkb.8.2011.11.28.14.41.43\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 28 Nov 2011 14:41:43 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4] test: fix test_require_external_prereq()\r
+Date: Tue, 29 Nov 2011 02:41:04 +0400\r
+Message-Id: <1322520067-15227-2-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1322520067-15227-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1322520067-15227-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 28 Nov 2011 22:41:45 -0000\r
+\r
+test_missing_external_prereq_${binary}_ variable indicates that the\r
+binary is missing.  It must be set in test_declare_external_prereq()\r
+outside of the fake $binary() function.\r
+---\r
+ test/test-lib.sh |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 11e6646..d7282ff 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -554,8 +554,8 @@ test_declare_external_prereq () {\r
+       test "$#" = 2 && name=$2 || name="$binary(1)"\r
+ \r
+       hash $binary 2>/dev/null || eval "\r
+-$binary () {\r
+       test_missing_external_prereq_${binary}_=t\r
++$binary () {\r
+       echo -n \"\$test_subtest_missing_external_prereqs_\" | grep -e \" $name \" ||\r
+       test_subtest_missing_external_prereqs_=\"$test_subtest_missing_external_prereqs_ $name\"\r
+       false\r
+-- \r
+1.7.7.3\r
+\r