More fixes to allow pg_rewind tests to run on Msys.

adunstan · adunstan · commit 15c3a1b45b48 · 2015-08-11T08:58:58.000-04:00
diff --git a/src/bin/pg_rewind/RewindTest.pm b/src/bin/pg_rewind/RewindTest.pm
@@ -40,6 +40,7 @@ use warnings;
 use TestLib;
 use Test::More;
 
+use Config;
 use File::Copy;
 use File::Path qw(rmtree);
 use IPC::Run qw(run start);
@@ -119,6 +120,7 @@ sub check_query
 	}
 	else
 	{
+		$stdout =~ s/\r//g if $Config{osname} eq 'msys';
 		is($stdout, $expected_stdout, "$test_name: query result matches");
 	}
 }
@@ -138,6 +140,7 @@ sub poll_query_until
 		my $result = run $cmd, '>', \$stdout, '2>', \$stderr;
 
 		chomp($stdout);
+		$stdout =~ s/\r//g if $Config{osname} eq 'msys';
 		if ($stdout eq "t")
 		{
 			return 1;
diff --git a/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl b/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 use File::Copy;
-use File::Path qw(remove_tree);
+use File::Path qw(rmtree);
 use TestLib;
 use Test::More;
 if ($windows_os)
@@ -25,7 +25,7 @@ sub run_test
 
 	my $master_xlogdir = "$tmp_check/xlog_master";
 
-	remove_tree($master_xlogdir);
+	rmtree($master_xlogdir);
 	RewindTest::setup_cluster();
 
 	# turn pg_xlog into a symlink

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ use warnings;`
`40`	`40`	`use TestLib;`
`41`	`41`	`use Test::More;`
`42`	`42`
	`43`	`+use Config;`
`43`	`44`	`use File::Copy;`
`44`	`45`	`use File::Path qw(rmtree);`
`45`	`46`	`use IPC::Run qw(run start);`
`@@ -119,6 +120,7 @@ sub check_query`
`119`	`120`	`}`
`120`	`121`	`else`
`121`	`122`	`{`
	`123`	`+ $stdout =~ s/\r//g if $Config{osname} eq 'msys';`
`122`	`124`	`is($stdout, $expected_stdout, "$test_name: query result matches");`
`123`	`125`	`}`
`124`	`126`	`}`
`@@ -138,6 +140,7 @@ sub poll_query_until`
`138`	`140`	`my $result = run $cmd, '>', \$stdout, '2>', \$stderr;`
`139`	`141`
`140`	`142`	`chomp($stdout);`
	`143`	`+ $stdout =~ s/\r//g if $Config{osname} eq 'msys';`
`141`	`144`	`if ($stdout eq "t")`
`142`	`145`	`{`
`143`	`146`	`return 1;`