diff options
| author | Noah Misch <noah@leadboat.com> | 2020-03-19 09:39:26 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2020-03-19 09:39:26 -0700 |
| commit | 12034da6cc39373fdb378ade133aec71c7730828 (patch) | |
| tree | a54ff846d5faa9e56ae602593ddaa91d0f8db16a /src/test/perl/TestLib.pm | |
| parent | c2c2e531e7b4810900466feffe13fda30bd0ebd1 (diff) | |
Back-patch src/test/recovery and PostgresNode from 9.6 to 9.5.
This omits 007_sync_rep.pl, which tests a feature new in 9.6. The only
other change is to substitute "hot_standby" for "replica". A planned
back-patch will use this suite to test its recovery behavior changes.
Identified by Kyotaro Horiguchi, though I did not use his patch.
Discussion: https://postgr.es/m/20200304.162919.898938381201316571.horikyota.ntt@gmail.com
Diffstat (limited to 'src/test/perl/TestLib.pm')
| -rw-r--r-- | src/test/perl/TestLib.pm | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index 35505afe026..b2c536b044a 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -15,6 +15,7 @@ our @EXPORT = qw( psql slurp_dir slurp_file + append_to_file system_or_bail system_log run_log @@ -129,6 +130,33 @@ sub tempdir_short return File::Temp::tempdir(CLEANUP => 1); } +# Translate a Perl file name to a host file name. Currently, this is a no-op +# except for the case of Perl=msys and host=mingw32. The subject need not +# exist, but its parent directory must exist. +sub perl2host +{ + my ($subject) = @_; + return $subject unless $Config{osname} eq 'msys'; + my $here = cwd; + my $leaf; + if (chdir $subject) + { + $leaf = ''; + } + else + { + $leaf = '/' . basename $subject; + my $parent = dirname $subject; + chdir $parent or die "could not chdir \"$parent\": $!"; + } + + # this odd way of calling 'pwd -W' is the only way that seems to work. + my $dir = qx{sh -c "pwd -W"}; + chomp $dir; + chdir $here; + return $dir . $leaf; +} + # Initialize a new cluster for testing. # # The PGHOST environment variable is set to connect to the new cluster. @@ -257,6 +285,15 @@ sub slurp_file return $contents; } +sub append_to_file +{ + my ($filename, $str) = @_; + open my $fh, ">>", $filename + or die "could not write \"$filename\": $!"; + print $fh $str; + close $fh; +} + sub system_or_bail { if (system_log(@_) != 0) |