[RESEND] [PATCH] Mac OS lib patches for bleadperl

[p5sagit/p5-mst-13.2.git] / t / lib / filefind.t

diff --git a/t/lib/filefind.t b/t/lib/filefind.t
index 362c1eb..72e2669 100755 (executable)
--- a/t/lib/filefind.t
+++ b/t/lib/filefind.t
@@ -9,29 +9,40 @@ BEGIN {
     @INC = '../lib';
 }
 
-if ( $symlink_exists ) { print "1..117\n"; }
+if ( $symlink_exists ) { print "1..119\n"; }
 else                   { print "1..61\n"; }
 
 use File::Find;
 
+cleanup();
+
 find(sub { print "ok 1\n" if $_ eq 'filefind.t'; }, ".");
 finddepth(sub { print "ok 2\n" if $_ eq 'filefind.t'; }, ".");
 
-
 my $case = 2;
 my $FastFileTests_OK = 0;
 
+sub cleanup {
+    if (-d 'for_find') {
+       chdir('for_find');
+    }
+    if (-d 'fa') {
+       unlink 'fa/fa_ord', 'fa/fsl', 'fa/faa/faa_ord',
+       'fa/fab/fab_ord', 'fa/fab/faba/faba_ord',
+       'fb/fb_ord', 'fb/fba/fba_ord';
+       rmdir 'fa/faa';
+       rmdir 'fa/fab/faba';
+       rmdir 'fa/fab';
+       rmdir 'fa';
+       rmdir 'fb/fba';
+       rmdir 'fb';
+       chdir '..';
+       rmdir 'for_find';
+    }
+}
+
 END {
-    unlink 'fa/fa_ord','fa/fsl','fa/faa/faa_ord',
-          'fa/fab/fab_ord','fa/fab/faba/faba_ord','fb/fb_ord','fb/fba/fba_ord';
-    rmdir 'fa/faa';
-    rmdir 'fa/fab/faba';
-    rmdir 'fa/fab';
-    rmdir 'fa';
-    rmdir 'fb/fba';
-    rmdir 'fb';
-    chdir '..';
-    rmdir 'for_find';
+    cleanup();
 }
 
 sub Check($) {
@@ -192,6 +203,15 @@ if ( $symlink_exists ) {
 
   File::Find::finddepth( {wanted => \&d_wanted, follow_fast => 1, no_chdir => 1},'fa' );
   Check( scalar(keys %Expect) == 0 );
+
+  # Verify that File::Find::find will call wanted even if the topdir of
+  #  is a symlink to a directory, and it shouldn't follow the link
+  #  unless follow is set, which it isn't in this case
+  %Expect = ('fsl' => 1);
+  %Expect_Dir = ();
+  File::Find::find( {wanted => \&wanted, },'fa/fsl' );
+  Check( scalar(keys %Expect) == 0 );
+
 }
 
 print "# of cases: $case\n";