mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cb/t0000-use-the-configured-shell'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2020-05-08 14:25:12 -07:00
parent 37b48f0efc 0555e4af58
commit 41eae3eaa8
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/t0000-basic.sh
View File

@ -77,9 +77,7 @@ _run_sub_test_lib_test_common () {
# the sub-test. # the sub-test.
sane_unset HARNESS_ACTIVE && sane_unset HARNESS_ACTIVE &&
cd "$name" && cd "$name" &&
cat >"$name.sh" <<-EOF && write_script "$name.sh" "$TEST_SHELL_PATH" <<-EOF &&
#!$SHELL_PATH
test_description='$descr (run in sub test-lib) test_description='$descr (run in sub test-lib)
This is run in a sub test-lib so that we do not get incorrect 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 . "\$TEST_DIRECTORY"/test-lib.sh
EOF EOF
cat >>"$name.sh" && cat >>"$name.sh" &&
chmod +x "$name.sh" &&
export TEST_DIRECTORY && export TEST_DIRECTORY &&
TEST_OUTPUT_DIRECTORY=$(pwd) && TEST_OUTPUT_DIRECTORY=$(pwd) &&
export TEST_OUTPUT_DIRECTORY && export TEST_OUTPUT_DIRECTORY &&
@ -103,7 +100,7 @@ _run_sub_test_lib_test_common () {
then then
./"$name.sh" "$@" >out 2>err ./"$name.sh" "$@" >out 2>err
else else
! ./"$name.sh" "$@" >out 2>err ! ./"$name.sh" "$@" >out 2>err
fi fi
) )
} }