mirror of
https://github.com/postgres/postgres.git
synced 2025-06-22 02:52:08 +03:00
Consolidate methods for translating a Perl path to a Windows path.
This fixes some TAP suites when using msys Perl and a builddir located in an msys mount point other than "/". For example, builddir=/c/pg exhibited the problem, since /c/pg falls in mount point "/c". Back-patch to 9.6, where tests first started to perform such translations. In back branches, offer both new and old APIs. Reviewed by Andrew Dunstan. Discussion: https://postgr.es/m/20190610045838.GA238501@rfd.leadboat.com
This commit is contained in:
@ -107,8 +107,7 @@ our @EXPORT = qw(
|
||||
our ($use_tcp, $test_localhost, $test_pghost, $last_host_assigned,
|
||||
$last_port_assigned, @all_nodes, $died);
|
||||
|
||||
# Windows path to virtual file system root
|
||||
|
||||
# For backward compatibility only.
|
||||
our $vfs_path = '';
|
||||
if ($Config{osname} eq 'msys')
|
||||
{
|
||||
@ -904,7 +903,7 @@ standby_mode=on
|
||||
sub enable_restoring
|
||||
{
|
||||
my ($self, $root_node) = @_;
|
||||
my $path = $vfs_path . $root_node->archive_dir;
|
||||
my $path = TestLib::perl2host($root_node->archive_dir);
|
||||
my $name = $self->name;
|
||||
|
||||
print "### Enabling WAL restore for node \"$name\"\n";
|
||||
@ -933,7 +932,7 @@ standby_mode = on
|
||||
sub enable_archiving
|
||||
{
|
||||
my ($self) = @_;
|
||||
my $path = $vfs_path . $self->archive_dir;
|
||||
my $path = TestLib::perl2host($self->archive_dir);
|
||||
my $name = $self->name;
|
||||
|
||||
print "### Enabling WAL archiving for node \"$name\"\n";
|
||||
|
Reference in New Issue
Block a user