aboutsummaryrefslogtreecommitdiff
path: root/src/bin/pg_rewind/RewindTest.pm
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2015-08-05 16:21:54 -0400
committerAndrew Dunstan <andrew@dunslane.net>2015-08-05 16:21:54 -0400
commit7c29764a354a0e7deb3c28e1d5c38ff6662ee3f9 (patch)
tree75158062c0e00bc34839fa517d2ebb62102b51a0 /src/bin/pg_rewind/RewindTest.pm
parentff85fc8d0b3ae88221e20ee9b070c23248eb7921 (diff)
downloadpostgresql-7c29764a354a0e7deb3c28e1d5c38ff6662ee3f9.tar.gz
postgresql-7c29764a354a0e7deb3c28e1d5c38ff6662ee3f9.zip
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.
Diffstat (limited to 'src/bin/pg_rewind/RewindTest.pm')
-rw-r--r--src/bin/pg_rewind/RewindTest.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/pg_rewind/RewindTest.pm b/src/bin/pg_rewind/RewindTest.pm
index b66ff0dc2ad..fa6d24b0337 100644
--- a/src/bin/pg_rewind/RewindTest.pm
+++ b/src/bin/pg_rewind/RewindTest.pm
@@ -41,7 +41,7 @@ use TestLib;
use Test::More;
use File::Copy;
-use File::Path qw(remove_tree);
+use File::Path qw(rmtree);
use IPC::Run qw(run start);
use Exporter 'import';
@@ -166,7 +166,7 @@ sub append_to_file
sub setup_cluster
{
# Initialize master, data checksums are mandatory
- remove_tree($test_master_datadir);
+ rmtree($test_master_datadir);
standard_initdb($test_master_datadir);
# Custom parameters for master's postgresql.conf
@@ -202,7 +202,7 @@ sub create_standby
{
# Set up standby with necessary parameter
- remove_tree $test_standby_datadir;
+ rmtree $test_standby_datadir;
# Base backup is taken with xlog files included
system_or_bail('pg_basebackup', '-D', $test_standby_datadir,