Skip to content

Commit ec5faa6

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
fixup??? mingw: allow git.exe to be used instead of the "Git wrapper"
The Meson builds really differ wildly from the regular Git for Windows builds. For example, the `RUNTIME_PREFIX` is not set, and neither is `HAVE_WPGMPTR`. However, both of them are required for the assumptions of t0060.221(MSYSTEM/PATH is adjusted if necessary) to hold. Let's add the `RUNTIME_PREFIX` prereq to ensure that the test case is skipped if that is not available. Technically, we also need to add a prereq for `HAVE_WPGMPTR`, but that would require a lot of work, this flag is not even close to wired through from the Makefile to `t/test-lib.sh`, and then there's now also Meson to contend with. Thanks, but I have enough to do already. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 416e407 commit ec5faa6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t0060-path-utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works'
620620
test_cmp expect actual
621621
'
622622

623-
test_expect_success MINGW 'MSYSTEM/PATH is adjusted if necessary' '
623+
test_expect_success MINGW,RUNTIME_PREFIX 'MSYSTEM/PATH is adjusted if necessary' '
624624
mkdir -p "$HOME"/bin pretend/mingw64/bin \
625625
pretend/mingw64/libexec/git-core pretend/usr/bin &&
626626
cp "$GIT_EXEC_PATH"/git.exe pretend/mingw64/bin/ &&

0 commit comments

Comments
 (0)