pg.ddx.io pgsql-committers@postgresql.org mailing list archive
help / color / mirror / Atom feedFrom: Andrew Dunstan <andrew@dunslane.net>
To: pgsql-committers@lists.postgresql.org
Subject: pgsql: Make platform guards in two regression tests match meson builds
Date: Fri, 28 Aug 2026 13:39:24 +0000
Message-ID: <E1wzwni-00000002UpV-3t16@gemulon.postgresql.org> (raw)
Make platform guards in two regression tests match meson builds
collate.linux.utf8 skips itself unless version() matches "linux-gnu",
and infinite_recurse skips itself when version() matches
"powerpc64[^,]*-linux-gnu". configure substitutes the GNU host triplet
into that string, but the meson build composes it from
host_machine.cpu_family() and host_system, which never carries the ABI
suffix. So ever since meson support arrived in 16, collate.linux.utf8
has not run at all on a meson build, and infinite_recurse has been
running on ppc64 Linux the very case it means to stay away from.
Meson documentation says it reports 'ppc64' instead of 'powerpc64'.
Fix by matching "-linux[-,]" and "p(ower)?pc64[^,]*-linux", which match
all spellings. Keeping the punctuation on either side confines the
match to the platform field. Neither pattern excludes musl, but
collate.linux.utf8's other conditions already require a set of glibc
locales to be present.
Backpatch to 16, where the meson build was introduced.
Discussion: https://postgr.es/m/a40b19da-9a02-47b4-8afd-2bbbde8db1e8@dunslane.net
Reviewed-By: Jonathan Gonzalez V. <jonathan@abdiel.eu>
Reviewed-By: Nazir Bilal Yavuz <byavuz81@gmail.com>
Branch
------
REL_18_STABLE
Details
-------
https://git.postgresql.org/pg/commitdiff/b3fa61ab7986ba980f0c03112caa3c01c4f91f0b
Modified Files
--------------
src/test/regress/expected/collate.linux.utf8.out | 2 +-
src/test/regress/expected/collate.linux.utf8_1.out | 2 +-
src/test/regress/expected/infinite_recurse.out | 2 +-
src/test/regress/expected/infinite_recurse_1.out | 2 +-
src/test/regress/sql/collate.linux.utf8.sql | 2 +-
src/test/regress/sql/infinite_recurse.sql | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
view thread (5+ messages) latest in thread
Message-ID: <E1wzwni-00000002UpV-3t16@gemulon.postgresql.org>
Permalink: ../E1wzwni-00000002UpV-3t16@gemulon.postgresql.org/
Also on: postgresql.org/message-id/E1wzwni-00000002UpV-3t16@gemulon.postgresql.org
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-committers@postgresql.org
Cc: andrew@dunslane.net, pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: Make platform guards in two regression tests match meson builds
In-Reply-To: <E1wzwni-00000002UpV-3t16@gemulon.postgresql.org>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox