diff options
author | Michael Paquier <michael@paquier.xyz> | 2021-09-17 09:11:47 +0900 |
---|---|---|
committer | Michael Paquier <michael@paquier.xyz> | 2021-09-17 09:11:47 +0900 |
commit | 5adb06732d7fac8171609392ea83f18bc8f285f4 (patch) | |
tree | 9b8a0faad1de15c05cc23cf1b2e812b0bfa53d1f /src | |
parent | 3f50b82639637c9908afa2087de7588450aa866b (diff) | |
download | postgresql-5adb06732d7fac8171609392ea83f18bc8f285f4.tar.gz postgresql-5adb06732d7fac8171609392ea83f18bc8f285f4.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/bin/pg_checksums/t/002_actions.pl | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t/002_actions.pl index 2cc8b68c75f..97492caab48 100644 --- a/src/bin/pg_checksums/t/002_actions.pl +++ b/src/bin/pg_checksums/t/002_actions.pl @@ -6,6 +6,7 @@ use strict; use warnings; +use Config; use PostgresNode; use TestLib; @@ -181,13 +182,18 @@ 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. -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=on is reported on an offline cluster'); +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=on is reported on an offline cluster'); +} # Checks cannot happen with an online cluster $node->start; |