Message ID | 2f566f330e01ed4249edad54671e98301dbeec5a.1630503102.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | test-lib-functions.sh: keep user's HOME, TERM and SHELL for 'test_pause' and 'debug' | expand |
"Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Philippe Blain <levraiphilippeblain@gmail.com> > > 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> > --- > t/test-lib-functions.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh > index e28411bb75a..1884177e293 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 Sensible.
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index e28411bb75a..1884177e293 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