Allow pg_rewind tap tests to run with older File::Path versions
authorAndrew Dunstan
Wed, 5 Aug 2015 20:21:54 +0000 (16:21 -0400)
committerAndrew Dunstan
Wed, 5 Aug 2015 20:21:54 +0000 (16:21 -0400)
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.

src/bin/pg_rewind/RewindTest.pm

index b66ff0dc2ad5a07102b700af65005c6bbd93e983..fa6d24b0337fce0ad7fa947df10aeae083590f9a 100644 (file)
@@ -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,