Skip to content

Commit 5adb067

Browse files
committed
Disable test for postgres -C on Msys
The output generated on Msys is incorrect because of the different way IPC::Run processes outputs with native Perl (converts natively \r\n to \n) and Msys perl (\r\n kept as-is), causing this test to fail. For now, just disable the test to bring the buildfarm to a green state. I think that the correct long-term solution would be to tweak all the routines command_checks_* in PostgresNode.pm to handle this output like psql does when using Msys, by discarding \r automatically before comparing it. Per report from jacana and fairywren. Thanks to Tom Lane for the ping. Discussion: https://postgr.es/m/1252480.1631829409@sss.pgh.pa.us
1 parent 3f50b82 commit 5adb067

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

src/bin/pg_checksums/t/002_actions.pl

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use strict;
88
use warnings;
9+
use Config;
910
use PostgresNode;
1011
use TestLib;
1112

@@ -181,13 +182,18 @@ sub check_relation_corruption
181182
# Test postgres -C for an offline cluster.
182183
# Run-time GUCs are safe to query here. Note that a lock file is created,
183184
# then unlinked, leading to an extra LOG entry showing in stderr.
184-
command_checks_all(
185-
[ 'postgres', '-D', $pgdata, '-C', 'data_checksums' ],
186-
0,
187-
[qr/^on$/],
188-
# LOG entry when unlinking lock file.
189-
[qr/database system is shut down/],
190-
'data_checksums=on is reported on an offline cluster');
185+
SKIP:
186+
{
187+
skip "unstable output generated with Msys", 3
188+
if ($Config{osname} eq 'msys');
189+
command_checks_all(
190+
[ 'postgres', '-D', $pgdata, '-C', 'data_checksums' ],
191+
0,
192+
[qr/^on$/],
193+
# LOG entry when unlinking lock file.
194+
[qr/database system is shut down/],
195+
'data_checksums=on is reported on an offline cluster');
196+
}
191197

192198
# Checks cannot happen with an online cluster
193199
$node->start;

0 commit comments

Comments
 (0)