From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sat, 28 May 2016 12:39:30 +0000 (+0300)
Subject: test: fix die() in test-lib-common.sh
X-Git-Tag: 0.23_rc0~87
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=36492f20a71906413d9922dbad5e18571059f57a

test: fix die() in test-lib-common.sh

In scripts that include test-lib-common.sh but not test-lib.sh
the die() implementation needs to be a bit different due to
fd redirection differences. test-lib-common.sh implements die()
only if it was not implemented already.
---

diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index fe92cdd3..0fdeeb72 100644
--- a/test/test-lib-common.sh
+++ b/test/test-lib-common.sh
@@ -18,6 +18,12 @@
 # This file contains common code to be used by both the regular
 # (correctness) tests and the performance tests.
 
+# test-lib.sh defines die() which echoes to nonstandard fd where
+# output was redirected earlier in that file. If test-lib.sh is not
+# loaded, neither this redirection nor die() function were defined.
+#
+type die >/dev/null 2>&1 || die () { echo "$@" >&2; exit 1; }
+
 find_notmuch_path ()
 {
     dir="$1"