X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FExtUtils%2Ft%2FMM_Unix.t;h=1e0e801754bbd6c00ee5f3aad52cd4ae5e0b9520;hb=479d2113ccb2226821ef75027b9186d1d0e367e9;hp=1e47f1bc370046eeb2da43e0655cda7ffb4a4725;hpb=f18b2318c1a1ea8f33016f2bf34abc4ac137b8e3;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/ExtUtils/t/MM_Unix.t b/lib/ExtUtils/t/MM_Unix.t
index 1e47f1b..1e0e801 100644
--- a/lib/ExtUtils/t/MM_Unix.t
+++ b/lib/ExtUtils/t/MM_Unix.t
@@ -18,7 +18,7 @@ BEGIN {
         plan skip_all => 'Non-Unix platform';
     }
     else {
-        plan tests => 112;
+        plan tests => 115;
     }
 }
 
@@ -79,14 +79,13 @@ foreach ( qw /
   dist_basics
   dist_ci
   dist_core
-  dist_dir
+  distdir
   dist_test
   dlsyms
   dynamic
   dynamic_bs
   dynamic_lib
   exescan
-  export_list
   extliblist
   find_perl
   fixin
@@ -103,7 +102,6 @@ foreach ( qw /
   makeaperl
   makefile
   manifypods
-  maybe_command_in_dirs
   needs_linking
   pasthru
   perldepend
@@ -165,10 +163,13 @@ is ($t->has_link_code(),1); is ($t->{HAS_LINK_CODE},1);
 ###############################################################################
 # libscan
 
-is ($t->libscan('RCS'),'','libscan on RCS');
-is ($t->libscan('CVS'),'','libscan on CVS');
-is ($t->libscan('SCCS'),'','libscan on SCCS');
-is ($t->libscan('Fatty'),'Fatty','libscan on something not RCS, CVS or SCCS');
+is ($t->libscan('foo/RCS/bar'),     '', 'libscan on RCS');
+is ($t->libscan('CVS/bar/car'),     '', 'libscan on CVS');
+is ($t->libscan('SCCS'),            '', 'libscan on SCCS');
+is ($t->libscan('.svn/something'),  '', 'libscan on Subversion');
+is ($t->libscan('foo/b~r'),         'foo/b~r', 'libscan on file with ~');
+
+is ($t->libscan('Fatty'), 'Fatty', 'libscan on something not a VC file' );
 
 ###############################################################################
 # maybe_command
@@ -214,6 +215,7 @@ is ($t->perl_script($self_name),$self_name, 'we pass as a perl_script()');
 ###############################################################################
 # perm_rw perm_rwx
 
+$t->init_PERM;
 is ($t->perm_rw(),'644', 'perm_rw() is 644');
 is ($t->perm_rwx(),'755', 'perm_rwx() is 755');
 
@@ -231,12 +233,13 @@ foreach (qw/ post_constants postamble post_initialize/)
 is ($t->replace_manpage_separator('Foo/Bar'),'Foo::Bar','manpage_separator'); 
 
 ###############################################################################
-# export_list, perl_archive, perl_archive_after
 
-foreach (qw/ export_list perl_archive perl_archive_after/)
-  {
-  is ($t->$_(),'',"$_() is empty string on Unix"); 
-  }
+$t->init_linker;
+foreach (qw/ EXPORT_LIST PERL_ARCHIVE PERL_ARCHIVE_AFTER /)
+{
+    ok( exists $t->{$_}, "$_ was defined" );
+    is( $t->{$_}, '', "$_ is empty on Unix"); 
+}
 
 
 {