RE: [ANNOUNCE] Archive::Tar 1.25

Message-ID: <533D273D4014D411AB1D00062938C4D90849C7A9@hotel.npl.co.uk>

p4raw-id: //depot/perl@25348

diff --git a/MANIFEST b/MANIFEST
index 1b8901f..74cf6a9 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1194,8 +1194,6 @@ lib/Archive/Tar/t/02_methods.t    Archive::Tar tests
 lib/Archive/Tar/t/03_file.t    Archive::Tar tests
 lib/Archive/Tar/t/04_resolved_issues.t Archive::Tar tests
 lib/Archive/Tar/t/99_clean.t   Archive::Tar test cleanup
-lib/Archive/Tar/t/src/long/b   Archive::Tar tests
-lib/Archive/Tar/t/src/short/b  Archive::Tar tests
 lib/Archive/Tar.pm             Archive::Tar
 lib/Attribute/Handlers/Changes Attribute::Handlers
 lib/Attribute/Handlers/demo/demo2.pl   Attribute::Handlers demo

diff --git a/lib/Archive/Tar/t/00_setup.t b/lib/Archive/Tar/t/00_setup.t
index e675f4f..888687e 100644 (file)
--- a/lib/Archive/Tar/t/00_setup.t
+++ b/lib/Archive/Tar/t/00_setup.t
@@ -1,4 +1,5 @@
 #!perl
+use File::Spec ();
 
 BEGIN {
     if ($ENV{PERL_CORE}) {
@@ -6,8 +7,15 @@ BEGIN {
     }
 }
 
+for my $d (qw(short long)) {
+    my $file = File::Spec->catfile($d,'b');
+    open F, '>', $file or die "Can't create $file: $!\n";
+    print F "bbbbbbbbbbb\n"; 
+    close F;
+}
+ 
 sub output {
-    $file = shift;
+    my $file = shift;
     open F, '>', $file or die "Can't create $file: $!\n";
     binmode F;
     for (@_) {

diff --git a/lib/Archive/Tar/t/02_methods.t b/lib/Archive/Tar/t/02_methods.t
index 9bb97be..99642f9 100644 (file)
--- a/lib/Archive/Tar/t/02_methods.t
+++ b/lib/Archive/Tar/t/02_methods.t
@@ -220,13 +220,7 @@ chmod 0644, $COMPRESS_FILE;
         is( scalar @files, scalar @add,
                                     "Adding files");
         is( $files[0]->name, 'b',   "   Proper name" );
-       use Config;
-       if ($ENV{PERL_CORE} and $Config{config_args} =~/Dmksymlinks/) {
-           ok( !$files[0]->is_file,  "   Proper type" );
-       }
-       else {
-           is( $files[0]->is_file, 1,  "   Proper type" );
-       }
+       is( $files[0]->is_file, 1,  "   Proper type" );
         like( $files[0]->get_content, qr/^bbbbbbbbbbb\s*$/,
                                     "   Content OK" );
 

diff --git a/lib/Archive/Tar/t/99_clean.t b/lib/Archive/Tar/t/99_clean.t
index 26778d7..4150ccf 100644 (file)
--- a/lib/Archive/Tar/t/99_clean.t
+++ b/lib/Archive/Tar/t/99_clean.t
@@ -1,4 +1,5 @@
 #!perl
+use File::Spec;
 
 BEGIN {
     if ($ENV{PERL_CORE}) {
@@ -6,6 +7,10 @@ BEGIN {
     }
 }
 
-unlink 'long/bar.tar', 'long/foo.tgz', 'short/bar.tar', 'short/foo.tgz';
+for my $d (qw(long short)) { 
+    for my $f (qw(b bar.tar foo.tgz)) {
+       unlink File::Spec->catfile($d, $f);
+    }
+}
 
 print "1..1\nok 1 - cleanup done\n";

diff --git a/lib/Archive/Tar/t/src/long/b b/lib/Archive/Tar/t/src/long/b
deleted file mode 100644 (file)
index 38f6d2d..0000000
--- a/lib/Archive/Tar/t/src/long/b
+++ /dev/null
@@ -1 +0,0 @@
-bbbbbbbbbbb

diff --git a/lib/Archive/Tar/t/src/short/b b/lib/Archive/Tar/t/src/short/b
deleted file mode 100644 (file)
index 38f6d2d..0000000
--- a/lib/Archive/Tar/t/src/short/b
+++ /dev/null
@@ -1 +0,0 @@
-bbbbbbbbbbb