From: Peter Eisentraut <peter@eisentraut.org>
Date: Thu, 25 Aug 2022 04:35:16 +0000 (+0200)
Subject: pg_dump: Fix new ICU tests
X-Git-Tag: REL_16_BETA1~1887
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4ddf3ee30bfb5b7da60411cabcf0589bdbd3f42;p=thirdparty%2Fpostgresql.git

pg_dump: Fix new ICU tests

ICU doesn't support some server encodings, so we need to exclude them
if a non-supported encoding was set up.
---

diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index 383bb46b25e..2873b662fb6 100644
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -3903,6 +3903,10 @@ my $supports_icu  = ($ENV{with_icu} eq 'yes');
 my $supports_lz4  = check_pg_config("#define USE_LZ4 1");
 my $supports_gzip = check_pg_config("#define HAVE_LIBZ 1");
 
+# ICU doesn't work with some encodings
+my $encoding = $node->safe_psql('postgres', 'show server_encoding');
+$supports_icu = 0 if $encoding eq 'SQL_ASCII';
+
 # Create additional databases for mutations of schema public
 $node->psql('postgres', 'create database regress_pg_dump_test;');
 $node->psql('postgres', 'create database regress_public_owner;');