From 36492f20a71906413d9922dbad5e18571059f57a Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sat, 28 May 2016 15:39:30 +0300 Subject: [PATCH] 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. --- test/test-lib-common.sh | 6 ++++++ 1 file changed, 6 insertions(+) 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" -- 2.26.2