Commit15c3a1b

committed

More fixes to allow pg_rewind tests to run on Msys.

1 parent6fcd885 commit15c3a1bCopy full SHA for 15c3a1b

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 0 deletions

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::Pathqw(rmtree);`
`45`	`46`	`use IPC::Runqw(run start);`
`@@ -119,6 +120,7 @@ sub check_query`
`119`	`120`	`}`
`120`	`121`	`else`
`121`	`122`	`{`
	`123`	`+$stdout =~s/\r//gif$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//gif$Config{osname}eq'msys';`
`141`	`144`	`if ($stdouteq"t")`
`142`	`145`	`{`
`143`	`146`	`return 1;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`use strict;`
`5`	`5`	`use warnings;`
`6`	`6`	`use File::Copy;`
`7`		`-use File::Pathqw(remove_tree);`
	`7`	`+use File::Pathqw(rmtree);`
`8`	`8`	`use TestLib;`
`9`	`9`	`use Test::More;`
`10`	`10`	`if ($windows_os)`
`@@ -25,7 +25,7 @@ sub run_test`
`25`	`25`
`26`	`26`	`my$master_xlogdir ="$tmp_check/xlog_master";`
`27`	`27`
`28`		`-remove_tree($master_xlogdir);`
	`28`	`+rmtree($master_xlogdir);`
`29`	`29`	`RewindTest::setup_cluster();`
`30`	`30`
`31`	`31`	`# turn pg_xlog into a symlink`

Comments

(0)