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

phil-blain · gitster · commit 0aa496b6d5d8 · 2021-09-07T10:53:39.000-07:00
3f824e9 (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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ test_tick () {`
`139`	`139`	`# Be sure to remove all invocations of this command before submitting.`
`140`	`140`
`141`	`141`	`test_pause () {`
`142`		`- "$SHELL_PATH" <&6 >&5 2>&7`
	`142`	`+ "$TEST_SHELL_PATH" <&6 >&5 2>&7`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`# Wrap git with a debugger. Adding this to a command can make it easier`