From: Andrew Dunstan <andrew@dunslane.net>
Date: Mon, 30 Sep 2019 19:48:54 +0000 (-0400)
Subject: Suppress another CR in program output
X-Git-Tag: REL_12_0~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b60f9afcf4bfe6b1ff73b49b9bab20dde356c7f4;p=postgresql

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 d2a9828dc6..4c3f608494 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -388,6 +388,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>);