diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-08 21:25:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-08 21:25:12 (GMT) |
| commit | 41eae3eaa81c5f2b61b2610ed74de15c4291b318 (patch) | |
| tree | 1dd8fa62e1a67ba904facaf4b028d7e553a83e83 | |
| parent | 37b48f0efcf14793315a8aa1056bd1976419efb3 (diff) | |
| parent | 0555e4af58a93497698f2d2015a05f63ac9b75f4 (diff) | |
| download | git-41eae3eaa81c5f2b61b2610ed74de15c4291b318.zip git-41eae3eaa81c5f2b61b2610ed74de15c4291b318.tar.gz git-41eae3eaa81c5f2b61b2610ed74de15c4291b318.tar.bz2 | |
Merge branch 'cb/t0000-use-the-configured-shell'
The basic test did not honor $TEST_SHELL_PATH setting, which has
been corrected.
* cb/t0000-use-the-configured-shell:
t/t0000-basic: make sure subtests also use TEST_SHELL_PATH
| -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 f58f3de..2ff176c 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -77,9 +77,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 @@ -94,7 +92,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 ) } |