From 7f5cf0ac7368790e4597642b59560fa1c16597d8 Mon Sep 17 00:00:00 2001 From: Craig Ringer Date: Thu, 3 Mar 2016 13:18:23 +0800 Subject: [PATCH 1/7] TAP: File::Path::remove_tree is new in 2.x, use 1.x rmtree instead Preserve Perl 5.8.8 support by using the legacy rmtree call instead of remove_tree from File::Path 2.x. --- src/test/recovery/t/004_timeline_switch.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/recovery/t/004_timeline_switch.pl b/src/test/recovery/t/004_timeline_switch.pl index 58bf580..a180b94 100644 --- a/src/test/recovery/t/004_timeline_switch.pl +++ b/src/test/recovery/t/004_timeline_switch.pl @@ -3,7 +3,7 @@ # on a new timeline. use strict; use warnings; -use File::Path qw(remove_tree); +use File::Path; use PostgresNode; use TestLib; use Test::More tests => 1; @@ -46,7 +46,7 @@ $node_master->teardown_node; $node_standby_1->promote; # Switch standby 2 to replay from standby 1 -remove_tree($node_standby_2->data_dir . '/recovery.conf'); +File::Path::rmtree($node_standby_2->data_dir . '/recovery.conf'); my $connstr_1 = $node_standby_1->connstr; $node_standby_2->append_conf( 'recovery.conf', qq( -- 2.1.0