From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sat, 24 Sep 2016 12:43:27 +0000 (+0300)
Subject: test: test-lib.sh: use $BASH instead of ${SHELL-sh} to relaunch
X-Git-Tag: 0.23_rc0~4
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=b57426a43549ac5434c0f793e184f1b0b955f7e0

test: test-lib.sh: use $BASH instead of ${SHELL-sh} to relaunch

In case of the test script is to be relaunced under valgrind, or --tee
is requested, use the $BASH shell variable to locate the command
interpreter. The $SHELL variable is re-set by non-interactive shells
so in case the shell uses some other shell (e.g. zsh) for interactive
use these bash scripts continue to work.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index e2e26e6f..bda8a80a 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -39,7 +39,7 @@ done,*)
 *' --tee '*|*' --va'*)
 	mkdir -p test-results
 	BASE=test-results/$this_test
-	(GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
+	(GIT_TEST_TEE_STARTED=done "$BASH" "$0" "$@" 2>&1;
 	 echo $? > $BASE.exit) | tee $BASE.out
 	test "$(cat $BASE.exit)" = 0
 	exit