X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Ftest-lib.sh;h=77879c258219a1ff9c7f59748ea20025a87ce492;hp=e2e26e6f274a1260ac570b09cd92f27ae90f1478;hb=a3ee732c522947a17329704aef2a099946420f52;hpb=971cdc72cdb80f060193bc0914dc9badcc29696b

diff --git a/test/test-lib.sh b/test/test-lib.sh
index e2e26e6f..77879c25 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
@@ -57,7 +57,7 @@ ORIGINAL_TERM=$TERM
 
 # dtach(1) provides more capable terminal environment to anything
 # that requires more than dumb terminal...
-[ x"${TERM:-dumb}" = xdumb ] && DTACH_TERM=vt100 || DTACH_TERM=$TERM
+[ x"${TERM:-dumb}" = xdumb ] && SMART_TERM=vt100 || SMART_TERM=$TERM
 
 # For repeatability, reset the environment to known value.
 LANG=C
@@ -1171,7 +1171,7 @@ test_emacs () {
 		# user's TERM (or 'vt100' in case user's TERM is unset, empty
 		# or 'dumb') is given to dtach which assumes a minimally
 		# VT100-compatible terminal -- and emacs inherits that
-		TERM=$DTACH_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \
+		TERM=$SMART_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \
 			sh -c "stty rows 24 cols 80; exec '$TMP_DIRECTORY/run_emacs' \
 				--no-window-system \
 				$load_emacs_tests \