Re: [RFC PATCH] test-lib: add missing prerequisites for Darwin
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 9, 2025, 18:24 UTC
- Message-ID
- <xmqq8qm0srh3.fsf@gitster.g>
- In-Reply-To
- <33de9e5d-24c8-47cf-b858-6d55d26803b0@ramsayjones.plus.com>
Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
Show 29 quoted lines
> commit d3d8c601fd ("t7815: fix unexpectedly passing test on macOS",
> 2025-06-02) added a MACOS prerequisite by adding a 'Darwin' case
> label to the 'OS-specific' case statement. However, this commit
> forgot to set several prerequisites which appear in the 'default'
> case label, in addition to the new MACOS prerequisite. This causes
> several tests, which macOS should pass, being skipped.
>
> In order to run all applicable tests on macOS, add the missing
> prerequisites to the 'Darwin' case.
>
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Junio, Patrick,
>
> I was looking at something else when I noticed this ... but I can't test
> this, since I don't have access to a macOS system (indeed I can't confirm
> that is actually a problem, but lots of tests should be being skipped! ;) ).
>
> I initially deleted the 'Darwin' case and set the MACOS prerequisite after
> the case statement - which may be a better solution. dunno.
>
> I marked this RFC because I can't test this. Hint, Hint ...
>
> Note, commit d3d8c601fd is only in next. If this is not going to be
> part of the release, then this (or something similar) could be squashed
> into it when the next branch is re-wound.
>
> Thanks.I do not have access to a macOS system either, but the change in this patch seems like a very safe and sane thing to do; it will bring us back to the state before that problematic commit with respect to these three prerequisites.
Let me queue it on top of ps/meson-tap-parse topic.
Thanks.
Show 17 quoted lines
> t/test-lib.sh | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/t/test-lib.sh b/t/test-lib.sh > index 9ffcae0472..51370a201c 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -1647,6 +1647,9 @@ uname_s=$(uname -s) > case $uname_s in > Darwin) > test_set_prereq MACOS > + test_set_prereq POSIXPERM > + test_set_prereq BSLASHPSPEC > + test_set_prereq EXECKEEPSPID > ;; > *MINGW*) > # Windows has its own (incompatible) sort and find