зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
41eae3eaa8
|
@ -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
|
||||
)
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче