Remove carriage returns from certain tap test output under Msys

adunstan · adunstan · commit ff85fc8d0b3a · 2015-08-05T16:19:23.000-04:00
These were causing spurious test failures.
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
@@ -226,6 +226,7 @@ sub psql
 	print("# Running SQL command: $sql\n");
 	run [ 'psql', '-X', '-A', '-t', '-q', '-d', $dbname, '-f', '-' ], '<', \$sql, '>', \$stdout, '2>', \$stderr or die;
 	chomp $stdout;
+	$stdout =~ s/\r//g if $Config{osname} eq 'msys';
 	return $stdout;
 }
 
@@ -242,7 +243,9 @@ sub slurp_file
 {
 	local $/;
 	local @ARGV = @_;
-	<>
+	my $contents = <>;
+	$contents =~ s/\r//g if $Config{osname} eq 'msys';
+	return $contents;
 }
 
 sub system_or_bail

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@ sub psql`
`226`	`226`	`print("# Running SQL command: $sql\n");`
`227`	`227`	`run [ 'psql', '-X', '-A', '-t', '-q', '-d', $dbname, '-f', '-' ], '<', \$sql, '>', \$stdout, '2>', \$stderr or die;`
`228`	`228`	`chomp $stdout;`
	`229`	`+ $stdout =~ s/\r//g if $Config{osname} eq 'msys';`
`229`	`230`	`return $stdout;`
`230`	`231`	`}`
`231`	`232`
`@@ -242,7 +243,9 @@ sub slurp_file`
`242`	`243`	`{`
`243`	`244`	`local $/;`
`244`	`245`	`local @ARGV = @_;`
`245`		`- <>`
	`246`	`+ my $contents = <>;`
	`247`	`+ $contents =~ s/\r//g if $Config{osname} eq 'msys';`
	`248`	`+ return $contents;`
`246`	`249`	`}`
`247`	`250`
`248`	`251`	`sub system_or_bail`