On Mon, Jun 09, 2025 at 11:24:40AM -0700, Junio C Hamano wrote: > Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> writes: > > > 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@xxxxxxxxxxxxxxxxxxxx> > > --- > > > > 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. Yup, that change looks reasonable to me, as well. I cannot test it right now though as I'm on vacation until the end of June, so I ain't got access to any macOS devices right now. Patrick