On Fri, Apr 01, 2022 at 08:53:10PM +0900, Michael Paquier wrote: > On Fri, Apr 01, 2022 at 03:01:38PM +0900, Michael Paquier wrote: > > On Thu, Mar 31, 2022 at 10:51:59PM -0500, Justin Pryzby wrote: > >> Is diff -q defined somewhere ? I can't find it in postgres sources nor in > >> sources for bf client. > > > > 322becb has added such a call, at the end of 002_pg_upgrade.pl. > > vcregress.pl also has one before this commit. > > The Windows animals seem to be in good shape, except hamerkop that > dies on "vcregress upgradecheck" when the TAP tests are disabled > causing the buildfarm client to stop. My idea to use upgradecheck > leads to more code than just moving the test to bincheck so let's > reuse the suggestion from Andres upthread and disable completely > upgradecheck, keeping the target around only for compatibility. The > attached does that, and the test of pg_upgrade would go through > bincheck instead.
If you do that, should also remove upgradecheck from .cirrus.yaml, which currently runs the upgradecheck target. I suspect this'll cause windows CI a bit slower. https://cirrus-ci.com/task/4703731324289024 An alternative to your patch to have the buildfarm client avoid calling upgradecheck if tap tests are disabled. Under your patch, upgrade check is a NOP, so it should stop calling upgradecheck anyway. So maybe this is a better option ? -- Justin