diff options
author | Richard Levitte <levitte@openssl.org> | 2016-02-08 16:44:48 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-02-08 17:03:37 +0100 |
commit | 4500a4cd4d89ba338ad796d39ccb9d94794cc0d7 (patch) | |
tree | aff3187632882943c2c72e9f240678502f5b9003 /test | |
parent | dca99383c2836d538c6d0129bb42401d86c8775b (diff) | |
download | openssl-4500a4cd4d89ba338ad796d39ccb9d94794cc0d7.tar.gz |
Use File::Path::rmtree rather than File::Path::remove_tree
Just like File::Path::make_path, File::Path::remove_tree didn't show
up before File::Path 2.06 / perl v5.10.1, so we prefer the legacy
function here as well.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/testlib/OpenSSL/Test.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm index 297de8642f..80b9a2fe75 100644 --- a/test/testlib/OpenSSL/Test.pm +++ b/test/testlib/OpenSSL/Test.pm @@ -46,7 +46,7 @@ use File::Copy; use File::Spec::Functions qw/file_name_is_absolute curdir canonpath splitdir catdir catfile splitpath catpath devnull abs2rel rel2abs/; -use File::Path 2.00 qw/remove_tree mkpath/; +use File::Path 2.00 qw/rmtree mkpath/; # The name of the test. This is set by setup() and is used in the other @@ -189,7 +189,7 @@ sub indir { __cwd($reverse); if ($opts{cleanup}) { - remove_tree($subdir, { safe => 0 }); + rmtree($subdir, { safe => 0 }); } } @@ -674,7 +674,7 @@ sub __cwd { return undef unless chdir($dir); if ($opts{cleanup}) { - remove_tree(".", { safe => 0, keep_root => 1 }); + rmtree(".", { safe => 0, keep_root => 1 }); } # For each of these directory variables, figure out where they are relative |