test_extensions: make meson.build consistent with Makefile.

jeff-davis · jeff-davis · commit 877bf52cffe5 · 2023-06-19T18:30:51.000-07:00
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 e692727. 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
@@ -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
@@ -47,5 +47,6 @@ tests += {
       'test_extensions',
       'test_extdepend',
     ],
+    'regress_args': ['--no-locale', '--encoding=UTF8'],
   },
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ tests += {`
`37`	`37`	`'sql': [`
`38`	`38`	`'unaccent',`
`39`	`39`	`],`
`40`		`- 'regress_args': ['--encoding=UTF8', '--no-locale'],`
	`40`	`+ 'regress_args': ['--no-locale', '--encoding=UTF8'],`
`41`	`41`	`},`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,6 @@ tests += {`
`47`	`47`	`'test_extensions',`
`48`	`48`	`'test_extdepend',`
`49`	`49`	`],`
	`50`	`+ 'regress_args': ['--no-locale', '--encoding=UTF8'],`
`50`	`51`	`},`
`51`	`52`	`}`