t7815: fix unexpectedly passing test on macOS

In t7815, we have the following test:

    test_expect_failure !CYGWIN 'git grep .fi a' '
        git grep .fi a
    '

The test passes if '.' matches a NUL byte, which we expect to only
happen on Cygwin. The upcoming changes to support parsing TAP output in
Meson surface that this test, surprisingly, passes on macOS as well.

It is unclear how long the test has been passing on macOS already.
064eed36c7 (config.mak.uname: only set NO_REGEX on cygwin for v1.7,
2025-04-17) mentions that the test started to pass for Cygwin. This was
attributed to a new implementation of regcomp(3p) and friends, which was
inherited from FreeBSD. Given the BSD lineage of macOS it is feasible
that it also inherited similar code eventually that made the test pass
now.

It is somewhat dubious what the test actually brings to the table given
that it is quite platform specific. Ideally, we would fix this mess by
having a configure-time check whether regcomp(3p) works as expected,
including NUL bytes, and use our bundled version of the regex library in
case it doesn't. Like this, we could ensure that all platforms work the
same in this edge case and mark the new behaviour as expected.

This change is outside of the scope of this patch series, which only
introduces support for TAP. So instead of fixing the bigger issue,
ignore the test on Darwin like we already do for Cygwin.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Patrick Steinhardt 2025-06-02 08:44:47 +02:00 committed by Junio C Hamano
parent d4ea24b8a9
commit d3d8c601fd
2 changed files with 4 additions and 1 deletions

View File

@ -63,7 +63,7 @@ test_expect_success 'git grep ile a' '
git grep ile a git grep ile a
' '


test_expect_failure !CYGWIN 'git grep .fi a' ' test_expect_failure !CYGWIN,!MACOS 'git grep .fi a' '
git grep .fi a git grep .fi a
' '



View File

@ -1636,6 +1636,9 @@ fi
# Fix some commands on Windows, and other OS-specific things # Fix some commands on Windows, and other OS-specific things
uname_s=$(uname -s) uname_s=$(uname -s)
case $uname_s in case $uname_s in
Darwin)
test_set_prereq MACOS
;;
*MINGW*) *MINGW*)
# Windows has its own (incompatible) sort and find # Windows has its own (incompatible) sort and find
sort () { sort () {