Обсуждение: test_extensions: fix inconsistency between meson.build and Makefile

Поиск
Список
Период
Сортировка

test_extensions: fix inconsistency between meson.build and Makefile

От
Jeff Davis
Дата:
Patch attached. Currently, the Makefile specifies NO_LOCALE=1, and the
meson.build does not.


--
Jeff Davis
PostgreSQL Contributor Team - AWS



Вложения

Re: test_extensions: fix inconsistency between meson.build and Makefile

От
"Tristan Partin"
Дата:
On Fri Jun 16, 2023 at 3:29 PM CDT, Jeff Davis wrote:
> Patch attached. Currently, the Makefile specifies NO_LOCALE=1, and the
> meson.build does not.

Looks alright to me, but it might be nicer to change the order of
arguments to match contrib/unaccent/meson.build:40. Might help with
grepping in the future.

--
Tristan Partin
Neon (https://neon.tech)



Re: test_extensions: fix inconsistency between meson.build and Makefile

От
Gurjeet Singh
Дата:
On Fri, Jun 16, 2023 at 1:56 PM Tristan Partin <tristan@neon.tech> wrote:
>
> On Fri Jun 16, 2023 at 3:29 PM CDT, Jeff Davis wrote:
> > Patch attached. Currently, the Makefile specifies NO_LOCALE=1, and the
> > meson.build does not.
>
> Looks alright to me, but it might be nicer to change the order of
> arguments to match contrib/unaccent/meson.build:40. Might help with
> grepping in the future.

It seems that Jeff's patch tried to match the precedent set in
src/test/modules/test_oat_hooks/meson.build.

No matter which ordering Jeff's patch uses, it will be inconsistent
with one of the existing order of the options.

So attached is updated patch that makes the order consistent across
all 3 occurrences.

Best regards,
Gurjeet
http://Gurje.et

Вложения

Re: test_extensions: fix inconsistency between meson.build and Makefile

От
Michael Paquier
Дата:
On Sat, Jun 17, 2023 at 07:40:18AM -0700, Gurjeet Singh wrote:
> So attached is updated patch that makes the order consistent across
> all 3 occurrences.

There is no need to update unaccent since 44e73a4.

--- a/src/test/modules/test_extensions/meson.build
+++ b/src/test/modules/test_extensions/meson.build
@@ -47,5 +47,6 @@ tests += {
       'test_extensions',
       'test_extdepend',
     ],
+    'regress_args': ['--no-locale', '--encoding=UTF8'],

Why is the addition of --encoding necessary for test_extensions?  Its
Makefile has a NO_LOCALE, but it has no ENCODING set.
--
Michael

Вложения

Re: test_extensions: fix inconsistency between meson.build and Makefile

От
Jeff Davis
Дата:
On Thu, 2023-07-06 at 11:41 +0900, Michael Paquier wrote:
> Why is the addition of --encoding necessary for test_extensions?  Its
> Makefile has a NO_LOCALE, but it has no ENCODING set.

I think that was an oversight -- as you point out, the Makefile doesn't
set ENCODING, so the meson.build does not need to, either.

Regards,
    Jeff Davis