From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Mon, 6 Sep 2021 04:38:58 +0000 (+0000)
Subject: test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause'
X-Git-Tag: v2.34.0-rc0~167^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0aa496b6d5d8953ed51d5601f4cdf1d4cf19b82c;p=thirdparty%2Fgit.git

test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause'

3f824e91c8 (t/Makefile: introduce TEST_SHELL_PATH, 2017-12-08)
made it easy to use a different shell for the tests than 'SHELL_PATH'
used at compile time. But 'test_pause' still invokes 'SHELL_PATH'.

If TEST_SHELL_PATH is set, invoke that shell in 'test_pause' for
consistency.

Suggested-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index e28411bb75..1884177e29 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -139,7 +139,7 @@ test_tick () {
 # Be sure to remove all invocations of this command before submitting.
 
 test_pause () {
-	"$SHELL_PATH" <&6 >&5 2>&7
+	"$TEST_SHELL_PATH" <&6 >&5 2>&7
 }
 
 # Wrap git with a debugger. Adding this to a command can make it easier