diff options
| author | Carlo Marcelo Arenas Belón <carenas@gmail.com> | 2020-05-06 18:07:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-07 13:01:32 -0700 |
| commit | 0555e4af58a93497698f2d2015a05f63ac9b75f4 (patch) | |
| tree | 37edf2e94f56cc8dd1a876c0d5e41ae619306c12 | |
| parent | 041bc65923e13313ca1b77681c3b2950b5e0a163 (diff) | |
| download | git-0555e4af58a93497698f2d2015a05f63ac9b75f4.tar.gz | |
t/t0000-basic: make sure subtests also use TEST_SHELL_PATH
3f824e91c8 (t/Makefile: introduce TEST_SHELL_PATH, 2017-12-08) allows for
setting a shell for running the tests, but the generated subtests weren't
updated.
Correct that and while at it update it to use write_script.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0000-basic.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index b6566003dd..a221f9faf5 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -78,9 +78,7 @@ _run_sub_test_lib_test_common () { # the sub-test. sane_unset HARNESS_ACTIVE && cd "$name" && - cat >"$name.sh" <<-EOF && - #!$SHELL_PATH - + write_script "$name.sh" "$TEST_SHELL_PATH" <<-EOF && test_description='$descr (run in sub test-lib) This is run in a sub test-lib so that we do not get incorrect @@ -95,7 +93,6 @@ _run_sub_test_lib_test_common () { . "\$TEST_DIRECTORY"/test-lib.sh EOF cat >>"$name.sh" && - chmod +x "$name.sh" && export TEST_DIRECTORY && TEST_OUTPUT_DIRECTORY=$(pwd) && export TEST_OUTPUT_DIRECTORY && @@ -103,7 +100,7 @@ _run_sub_test_lib_test_common () { then ./"$name.sh" "$@" >out 2>err else - ! ./"$name.sh" "$@" >out 2>err + ! ./"$name.sh" "$@" >out 2>err fi ) } |