Skip to content

Commit f3eec38

Browse files
committed
fixup! WIP tests: accommodate for BusyBox-w32
1 parent 2bffdb8 commit f3eec38

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

t/test-lib.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,6 +1468,18 @@ GIT_TEMPLATE_DIR="$GIT_TEST_TEMPLATE_DIR"
14681468
GIT_CONFIG_NOSYSTEM=1
14691469
GIT_ATTR_NOSYSTEM=1
14701470
GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/.."
1471+
case "$($SHELL --help 2>&1)" in
1472+
*BusyBox*)
1473+
# Unlike the MSYS2 Bash, BusyBox' ash does not translate
1474+
# MSYS2-style paths to Windows form when spawning the native
1475+
# git.exe, so it would be handed unusable "/d/..." paths. Convert
1476+
# the variables git.exe consumes as paths to a Win32-digestible
1477+
# form.
1478+
GIT_EXEC_PATH="$(cygpath -m "$GIT_EXEC_PATH")"
1479+
GIT_TEMPLATE_DIR="$(cygpath -m "$GIT_TEMPLATE_DIR")"
1480+
GIT_CEILING_DIRECTORIES="$(cygpath -m "$GIT_CEILING_DIRECTORIES")"
1481+
;;
1482+
esac
14711483
export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_ATTR_NOSYSTEM GIT_CEILING_DIRECTORIES
14721484

14731485
# Add libc MALLOC and MALLOC_PERTURB test only if we are not executing

0 commit comments

Comments
 (0)