Commit 7c29764a authored by Andrew Dunstan's avatar Andrew Dunstan

Allow pg_rewind tap tests to run with older File::Path versions

Older versions have rmtree but not remove_tree. The one-argument forms
of these are equivalent, so replace remove_tree with rmtree. This allows
the tests to be run on oldish Msys systems.
parent ff85fc8d
...@@ -41,7 +41,7 @@ use TestLib; ...@@ -41,7 +41,7 @@ use TestLib;
use Test::More; use Test::More;
use File::Copy; use File::Copy;
use File::Path qw(remove_tree); use File::Path qw(rmtree);
use IPC::Run qw(run start); use IPC::Run qw(run start);
use Exporter 'import'; use Exporter 'import';
...@@ -166,7 +166,7 @@ sub append_to_file ...@@ -166,7 +166,7 @@ sub append_to_file
sub setup_cluster sub setup_cluster
{ {
# Initialize master, data checksums are mandatory # Initialize master, data checksums are mandatory
remove_tree($test_master_datadir); rmtree($test_master_datadir);
standard_initdb($test_master_datadir); standard_initdb($test_master_datadir);
# Custom parameters for master's postgresql.conf # Custom parameters for master's postgresql.conf
...@@ -202,7 +202,7 @@ sub create_standby ...@@ -202,7 +202,7 @@ sub create_standby
{ {
# Set up standby with necessary parameter # Set up standby with necessary parameter
remove_tree $test_standby_datadir; rmtree $test_standby_datadir;
# Base backup is taken with xlog files included # Base backup is taken with xlog files included
system_or_bail('pg_basebackup', '-D', $test_standby_datadir, system_or_bail('pg_basebackup', '-D', $test_standby_datadir,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment