NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit33f3bbc

committed

Fix TAP infrastructure to support Mingw better

archive_command and restore_command need to refer to Windows paths, notMsys virtual file system paths, as postgres is completely unaware of thelatter, so prefix them with the Windows path to the virtual file systemroot. Clean psql and pg_recvlogical output of carriage returns.

1 parent7d68f22 commit33f3bbcCopy full SHA for 33f3bbc

File tree

1 file changed

+15

-2

lines changed

src/test/perl
- PostgresNode.pm

1 file changed

+15

-2

lines changed

`‎src/test/perl/PostgresNode.pm`

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,15 @@ our @EXPORT = qw(`
`101`	`101`
`102`	`102`	`our ($test_localhost,$test_pghost,$last_port_assigned,@all_nodes);`
`103`	`103`
	`104`	`+# Windows path to virtual file system root`
	`105`	`+`
	`106`	`+our$vfs_path ='';`
	`107`	`+if ($Config{osname}eq'msys')`
	`108`	`+{`
	`109`	+$vfs_path =`cd / && pwd -W`;
	`110`	`+chomp$vfs_path;`
	`111`	`+}`
	`112`	`+`
`104`	`113`	`INIT`
`105`	`114`	`{`
`106`	`115`
`@@ -763,7 +772,7 @@ standby_mode=on`
`763`	`772`	`subenable_restoring`
`764`	`773`	`{`
`765`	`774`	`my ($self,$root_node) =@_;`
`766`		`-my$path =$root_node->archive_dir;`
	`775`	`+my$path =$vfs_path .$root_node->archive_dir;`
`767`	`776`	`my$name =$self->name;`
`768`	`777`
`769`	`778`	`print"### Enabling WAL restore for node\"$name\"\n";`
`@@ -791,7 +800,7 @@ standby_mode = on`
`791`	`800`	`subenable_archiving`
`792`	`801`	`{`
`793`	`802`	`my ($self) =@_;`
`794`		`-my$path =$self->archive_dir;`
	`803`	`+my$path =$vfs_path .$self->archive_dir;`
`795`	`804`	`my$name =$self->name;`
`796`	`805`
`797`	`806`	`print"### Enabling WAL archiving for node\"$name\"\n";`
`@@ -979,6 +988,7 @@ sub safe_psql`
`979`	`988`	`print"\n#### End standard error\n";`
`980`	`989`	`}`
`981`	`990`
	`991`	`+$stdout =~s/\r//gif$TestLib::windows_os;`
`982`	`992`	`return$stdout;`
`983`	`993`	`}`
`984`	`994`
`@@ -1579,6 +1589,9 @@ sub pg_recvlogical_upto`
`1579`	`1589`	`}`
`1580`	`1590`	`};`
`1581`	`1591`
	`1592`	`+$stdout =~s/\r//gif$TestLib::windows_os;`
	`1593`	`+$stderr =~s/\r//gif$TestLib::windows_os;`
	`1594`	`+`
`1582`	`1595`	`if (wantarray)`
`1583`	`1596`	`{`
`1584`	`1597`	`return ($ret,$stdout,$stderr,$timeout);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit33f3bbc

File tree

1 file changed

1 file changed

`‎src/test/perl/PostgresNode.pm`

0 commit comments