Date: Sat, 18 Sep 2021 08:18:58 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Andrew Dunstan <andrew@dunslane.net>
Cc: Tom Lane <tgl@sss.pgh.pa.us>, pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: Support "postgres -C" with runtime-computed GUCs
Message-ID: <YUUiYvhR+Kpuafj+@paquier.xyz>
References: <E1mQglq-0007xB-Jw@gemulon.postgresql.org>
 <1252480.1631829409@sss.pgh.pa.us>
 <YUPOfPqqbvuZeouS@paquier.xyz>
 <YUPlCVfPi1urH/iN@paquier.xyz>
 <22a1c05f-a931-ba46-fb88-ac9680e7816a@dunslane.net>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="LzFW3QWGL6EawvJZ"
Content-Disposition: inline
In-Reply-To: <22a1c05f-a931-ba46-fb88-ac9680e7816a@dunslane.net>
Archived-At: 
 <https://www.postgresql.org/message-id/YUUiYvhR%2BKpuafj%2B%40paquier.xyz>
Precedence: bulk


--LzFW3QWGL6EawvJZ
Content-Type: multipart/mixed; boundary="/hVa3VIlwG785P1g"
Content-Disposition: inline


--/hVa3VIlwG785P1g
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Sep 17, 2021 at 03:18:38PM -0400, Andrew Dunstan wrote:
> The fixups for command_checks_all should go before the loops, not inside
> them.

Right.

> I would probably add a single line like this just after the call that
> checks the status:
>=20
> =A0=A0 foreach ($stderr, $stdout) { s/\r\n/\n/g if $Config{osname} eq 'ms=
ys'; }

Yes, that works.  Fine by me to use this grammar.

> although maybe perltidy would reformat that.

And perltidy tells me nothing here.
--
Michael

--/hVa3VIlwG785P1g
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fix-tap-msys-crlf-2.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t=
/002_actions.pl
index 97492caab4..2cc8b68c75 100644
--- a/src/bin/pg_checksums/t/002_actions.pl
+++ b/src/bin/pg_checksums/t/002_actions.pl
@@ -6,7 +6,6 @@
=20
 use strict;
 use warnings;
-use Config;
 use PostgresNode;
 use TestLib;
=20
@@ -182,18 +181,13 @@ command_fails(
 # Test postgres -C for an offline cluster.
 # Run-time GUCs are safe to query here.  Note that a lock file is created,
 # then unlinked, leading to an extra LOG entry showing in stderr.
-SKIP:
-{
-	skip "unstable output generated with Msys", 3
-	  if ($Config{osname} eq 'msys');
-	command_checks_all(
-		[ 'postgres', '-D', $pgdata, '-C', 'data_checksums' ],
-		0,
-		[qr/^on$/],
-		# LOG entry when unlinking lock file.
-		[qr/database system is shut down/],
-		'data_checksums=3Don is reported on an offline cluster');
-}
+command_checks_all(
+	[ 'postgres', '-D', $pgdata, '-C', 'data_checksums' ],
+	0,
+	[qr/^on$/],
+	# LOG entry when unlinking lock file.
+	[qr/database system is shut down/],
+	'data_checksums=3Don is reported on an offline cluster');
=20
 # Checks cannot happen with an online cluster
 $node->start;
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index cbab1587cc..15f4e6f56e 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -434,6 +434,7 @@ sub run_command
 	my ($cmd) =3D @_;
 	my ($stdout, $stderr);
 	my $result =3D IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
+	foreach ($stderr, $stdout) { s/\r\n/\n/g if $Config{osname} eq 'msys'; }
 	chomp($stdout);
 	chomp($stderr);
 	return ($stdout, $stderr);
@@ -878,6 +879,7 @@ sub command_like
 	my $result =3D IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
 	ok($result, "$test_name: exit code 0");
 	is($stderr, '', "$test_name: no stderr");
+	$stdout =3D~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 	like($stdout, $expected_stdout, "$test_name: matches");
 	return;
 }
@@ -930,6 +932,7 @@ sub command_fails_like
 	print("# Running: " . join(" ", @{$cmd}) . "\n");
 	my $result =3D IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr;
 	ok(!$result, "$test_name: exit code not 0");
+	$stderr =3D~ s/\r\n/\n/g if $Config{osname} eq 'msys';
 	like($stderr, $expected_stderr, "$test_name: matches");
 	return;
 }
@@ -974,6 +977,8 @@ sub command_checks_all
 	  if $ret & 127;
 	$ret =3D $ret >> 8;
=20
+	foreach ($stderr, $stdout) { s/\r\n/\n/g if $Config{osname} eq 'msys'; }
+
 	# check status
 	ok($ret =3D=3D $expected_ret,
 		"$test_name status (got $ret vs expected $expected_ret)");

--/hVa3VIlwG785P1g--

--LzFW3QWGL6EawvJZ
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmFFImIACgkQnvQgOdby
QH1QIw//eya8eTJ64b3PhdeOJHlpz+ii56TUPEc/MrplpWgwpoI4dlBs5wd9fqqQ
kPmWU6uVKRncLiQWFVqAUQIakyToZ1uh0GRUc/GVJOoo9nvxmmS7pQGzT1DkYmqv
yiB8Up7MZMF31wouo1zKhlYPVlvnRoVYUuI3oTatmTbzzmd+k2vTsMKmVwV5nTVN
zyoOzG35cnFbGEF8BS/hCl852bYlTXEJ4wn2DWuMOGSQwPS5AiuKSxBV9/U/+I1z
/qeIq1lh/8KH9hvZCDVV1t/SNMdz8wsFAsk0snLWleMeDvyH1s2nmApDv8V9519+
nFsfFnjQPquJPH2U5YRLak/Gu/PlnESOeuLz07LsXmWkynkA3/qMSedKQNdwQpSO
v8GZmSy2lv+J7SIfhdqtKpkJElrxE0WpyQ5z7EjyPf5tI2I9qoVqGNAXA+cRpuhA
TgTg4q/o1WfkZdDlmGTE/R92pRzW0/4p+H8PXg7CSY8II7SkPItM0nu+xumKTQa1
vqrzso3pHgEQG2zyZ+PkHCbQPLW7A/aNyU3WP5JP9yz1N9bdvE/2t0ojAIkQ+4fc
Jj1SHAjJuFe7nbCdmWyCS5uoB+DkwHu6THQgUA2bZQELYxxCKxRcOZRY7w4eadec
2l2Q9wpVO9u/JEpkjuXG6w73tnSllngCmoVR9rKwik0GHJ6SS3M=
=FDJ/
-----END PGP SIGNATURE-----

--LzFW3QWGL6EawvJZ--