Clean up temp files/dirs left by Archive-Tar tests

Part of this reinstates change 25043 which was mistakenly removed
by change 25312

p4raw-id: //depot/perl@26785

2 files changed, 6 insertions, 2 deletions

diff --git a/lib/Archive/Tar/t/02_methods.t b/lib/Archive/Tar/t/02_methods.t
index 99642f9fba..c898a25524 100644
--- a/lib/Archive/Tar/t/02_methods.t
+++ b/lib/Archive/Tar/t/02_methods.t
@@ -684,6 +684,7 @@ sub check_tar_extract {
         like( $content, qr/$econtent/,
                                     "   Contents OK" );
 
+        close $fh;
         $NO_UNLINK or 1 while unlink $path;
 
         ### alternate extract path tests 
diff --git a/lib/Archive/Tar/t/99_clean.t b/lib/Archive/Tar/t/99_clean.t
index 4150ccfbb6..216cab2829 100644
--- a/lib/Archive/Tar/t/99_clean.t
+++ b/lib/Archive/Tar/t/99_clean.t
@@ -3,14 +3,17 @@ use File::Spec;
 
 BEGIN {
     if ($ENV{PERL_CORE}) {
-	chdir '../lib/Archive/Tar/t/src' if -d '../lib/Archive/Tar/t/src';
+	chdir '../lib/Archive/Tar/t' if -d '../lib/Archive/Tar/t';
     }
 }
 
 for my $d (qw(long short)) { 
     for my $f (qw(b bar.tar foo.tgz)) {
-	unlink File::Spec->catfile($d, $f);
+	unlink File::Spec->catfile('src', $d, $f);
     }
+    rmdir File::Spec->catdir('src', $d);
 }
 
+rmdir 'src';
+
 print "1..1\nok 1 - cleanup done\n";