Suppress another CR in program output

This one was exposed by a12c75a10.

Backpatch to release 11 where check_pg_config was introduced.

diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 92199792eba92a8e25e43faaffe4249c5682b731..905d0d178ff2caaec94d6a9a2186739c939c92dd 100644 (file)
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -560,6 +560,7 @@ sub check_pg_config
          \$stdout, '2>', \$stderr
          or die "could not execute pg_config";
        chomp($stdout);
+       $stdout =~ s/\r$//;
 
        open my $pg_config_h, '<', "$stdout/pg_config.h" or die "$!";
        my $match = (grep { /^$regexp/ } <$pg_config_h>);