From: Jeff Davis <jdavis@postgresql.org>
Date: Tue, 20 Jun 2023 01:08:59 +0000 (-0700)
Subject: test_extensions: make meson.build consistent with Makefile.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=877bf52cffe587d33556e6259f610eb932699706;p=users%2Frhaas%2Fpostgres.git

test_extensions: make meson.build consistent with Makefile.

Specify --no-locale and --encoding=UTF8 to be consistent with the
Makefile, which specifies NO_LOCALE=1. Fixes test for some locales
when meson is used and ICU is disabled. May have been an oversight in
e6927270cd.

Also switch argument order in unaccent/meson.build to make it
consistent in style.

Discussion: https://postgr.es/m/CABwTF4Wz41pNMJ9q3tpH=6mnvg6aopDU5Lzvers5=6=WJVekww@mail.gmail.com
Author: Gurjeet Singh
Author: Jeff Davis
---

diff --git a/contrib/unaccent/meson.build b/contrib/unaccent/meson.build
index 284d34ee29..bd629ec090 100644
--- a/contrib/unaccent/meson.build
+++ b/contrib/unaccent/meson.build
@@ -37,6 +37,6 @@ tests += {
     'sql': [
       'unaccent',
     ],
-    'regress_args': ['--encoding=UTF8', '--no-locale'],
+    'regress_args': ['--no-locale', '--encoding=UTF8'],
   },
 }
diff --git a/src/test/modules/test_extensions/meson.build b/src/test/modules/test_extensions/meson.build
index 29e5bb2fb5..698775b28d 100644
--- 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'],
   },
 }