diff options
| author | Michael Paquier <michael@paquier.xyz> | 2021-09-22 08:43:20 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2021-09-22 08:43:20 +0900 |
| commit | 76001de031a562a0f350daae381196fa44576eb3 (patch) | |
| tree | 4744f19c94b1a7c8a58fc3f43a35669ad4dee3d5 /src | |
| parent | e8b0bcae63ff3eed36353e2ec591cb7d2f683feb (diff) | |
| download | postgresql-76001de031a562a0f350daae381196fa44576eb3.tar.gz postgresql-76001de031a562a0f350daae381196fa44576eb3.zip | |
Fix places in TestLib.pm in need of adaptation to the output of Msys perl
Contrary to the output of native perl, Msys perl generates outputs with
CRLFs characters. There are already places in the TAP code where CRLFs
(\r\n) are automatically converted to LF (\n) on Msys, but we missed a
couple of places when running commands and using their output for
comparison, that would lead to failures.
This problem has been found thanks to the test added in 5adb067 using
TestLib::command_checks_all(), but after a closer look more code paths
were missing a filter.
This is backpatched all the way down to prevent any surprises if a new
test is introduced in stable branches.
Reviewed-by: Andrew Dunstan, Álvaro Herrera
Discussion: https://postgr.es/m/1252480.1631829409@sss.pgh.pa.us
Backpatch-through: 9.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/perl/TestLib.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index f1f90693a39..610736aeb5b 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -246,6 +246,7 @@ sub run_command my ($cmd) = @_; my ($stdout, $stderr); my $result = 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); @@ -542,6 +543,7 @@ sub command_like my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr; ok($result, "$test_name: exit code 0"); is($stderr, '', "$test_name: no stderr"); + $stdout =~ s/\r\n/\n/g if $Config{osname} eq 'msys'; like($stdout, $expected_stdout, "$test_name: matches"); return; } @@ -575,6 +577,7 @@ sub command_fails_like print("# Running: " . join(" ", @{$cmd}) . "\n"); my $result = IPC::Run::run $cmd, '>', \$stdout, '2>', \$stderr; ok(!$result, "$test_name: exit code not 0"); + $stderr =~ s/\r\n/\n/g if $Config{osname} eq 'msys'; like($stderr, $expected_stderr, "$test_name: matches"); return; } @@ -603,6 +606,8 @@ sub command_checks_all if $ret & 127; $ret = $ret >> 8; + foreach ($stderr, $stdout) { s/\r\n/\n/g if $Config{osname} eq 'msys'; } + # check status ok($ret == $expected_ret, "$test_name status (got $ret vs expected $expected_ret)"); |