git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix test failures when language environment is not UTF-8.

author Jeff Davis <jdavis@postgresql.org>

Thu, 4 Apr 2024 23:10:12 +0000 (16:10 -0700)

committer Jeff Davis <jdavis@postgresql.org>

Thu, 4 Apr 2024 23:10:12 +0000 (16:10 -0700)

For tests that depend on UTF-8 encoding, force LC_COLLATE=C and
LC_CTYPE=C to avoid an encoding mismatch.

Reported-by: Thomas Munro
Discussion: https://postgr.es/m/CA+hUKGK-ZqV1njkG_=xcCqXh2fcMkz85FTMnhS2opm4ZerH=xw@mail.gmail.com

src/bin/initdb/t/001_initdb.pl patch | blob | blame | history

src/bin/scripts/t/020_createdb.pl patch | blob | blame | history

diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl

index c63d3206d99bf7afec2297df4798cc12ca32fcc5..b31dad2464f413356cd2724be1591783118714a0 100644 (file)

--- a/src/bin/initdb/t/001_initdb.pl

+++ b/src/bin/initdb/t/001_initdb.pl

@@ -200,6 +200,7 @@ command_ok(

[

'initdb', '--no-sync',

'--locale-provider=builtin', '-E UTF-8',

+ '--lc-collate=C', '--lc-ctype=C',

'--builtin-locale=C.UTF-8', "$tempdir/data8"

'locale provider builtin with -E UTF-8 --builtin-locale=C.UTF-8');

@@ -208,6 +209,7 @@ command_fails(

[

'initdb', '--no-sync',

'--locale-provider=builtin', '-E SQL_ASCII',

+ '--lc-collate=C', '--lc-ctype=C',

'--builtin-locale=C.UTF-8', "$tempdir/data9"

'locale provider builtin with --builtin-locale=C.UTF-8 fails for SQL_ASCII'

diff --git a/src/bin/scripts/t/020_createdb.pl b/src/bin/scripts/t/020_createdb.pl

index 0b371ea4dfcc5aaec7d5d2677be9c7cc53dd3e87..512b55c48a98bacad8356845585c747a73200aa5 100644 (file)

--- a/src/bin/scripts/t/020_createdb.pl

+++ b/src/bin/scripts/t/020_createdb.pl

@@ -143,6 +143,7 @@ $node->command_ok(

[

'createdb', '-T',

'template0', '--locale-provider=builtin',

+ '--lc-collate=C', '--lc-ctype=C',

'-E UTF-8', '--builtin-locale=C.UTF8',

'tbuiltin5'

@@ -152,6 +153,7 @@ $node->command_fails(

[

'createdb', '-T',

'template0', '--locale-provider=builtin',

+ '--lc-collate=C', '--lc-ctype=C',

'-E LATIN1', '--builtin-locale=C.UTF-8',

'tbuiltin6'

This is the main PostgreSQL git repository.

RSS Atom