From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
Date: Mon, 28 Nov 2011 22:41:04 +0000 (+0400)
Subject: test: fix test_require_external_prereq()
X-Git-Tag: 0.11_rc1~81
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=716e9a45b9cfc44618edfcc2fbf9b7a066b37f1a

test: fix test_require_external_prereq()

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.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 11e66465..d7282ff6 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