diff options
| author | Noah Misch <noah@leadboat.com> | 2019-06-21 20:34:23 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2019-06-21 20:59:38 -0700 |
| commit | 186113b049c50a608b575e2597209e9eda99d83c (patch) | |
| tree | 05ce71bd4aec950a154a5cd965fe577b9e95f417 /src/test/perl/PostgresNode.pm | |
| parent | fe755edc5c7613de062aeb111763ffa8e6b902c4 (diff) | |
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
Diffstat (limited to 'src/test/perl/PostgresNode.pm')
| -rw-r--r-- | src/test/perl/PostgresNode.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm index 3daf396dbe4..ec5985623bc 100644 --- a/src/test/perl/PostgresNode.pm +++ b/src/test/perl/PostgresNode.pm @@ -102,8 +102,7 @@ our @EXPORT = qw( our ($use_tcp, $test_localhost, $test_pghost, $last_host_assigned, $last_port_assigned, @all_nodes); -# Windows path to virtual file system root - +# For backward compatibility only. our $vfs_path = ''; if ($Config{osname} eq 'msys') { @@ -844,7 +843,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"; @@ -872,7 +871,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"; |