Integrate with Sarathy.

p4raw-id: //depot/cfgperl@6175

3 files changed, 15 insertions, 3 deletions

diff --git a/t/lib/filefind.t b/t/lib/filefind.t
index b4615cc6bb..ca12e742ce 100755
--- a/t/lib/filefind.t
+++ b/t/lib/filefind.t
@@ -19,6 +19,7 @@ finddepth(sub { print "ok 2\n" if $_ eq 'filefind.t'; }, ".");
 
 
 my $case = 2;
+my $FastFileTests_OK = 0;
 
 END {
     unlink 'fa/fa_ord','fa/fsl','fa/faa/faa_ord',
@@ -57,8 +58,13 @@ sub wanted {
   print "# '$_' => 1\n";
   s#\.$## if ($^O eq 'VMS' && $_ ne '.');
   Check( $Expect{$_} );
-  delete $Expect{$_} 
-    unless ( $Expect_Dir{$_} && ! -d _ );
+  if ( $FastFileTests_OK ) {
+    delete $Expect{$_} 
+      unless ( $Expect_Dir{$_} && ! -d _ );
+  } else {
+    delete $Expect{$_} 
+      unless ( $Expect_Dir{$_} && ! -d $_ );
+  }
   $File::Find::prune=1 if  $_ eq 'faba';
   
 }
@@ -148,6 +154,7 @@ File::Find::finddepth( {wanted => \&d_wanted, no_chdir => 1 },'.' );
 Check( scalar(keys %Expect) == 0 );
 
 if ( $symlink_exists ) {
+  $FastFileTests_OK= 1;
   %Expect=('.' => 1, 'fa_ord' => 1, 'fsl' => 1, 'fb_ord' => 1, 'fba' => 1,
            'fba_ord' => 1, 'fab' => 1, 'fab_ord' => 1, 'faba' => 1, 'faa' => 1,
            'faa_ord' => 1);
diff --git a/t/op/re_tests b/t/op/re_tests
index 189077c628..37e8ee33cd 100644
--- a/t/op/re_tests
+++ b/t/op/re_tests
@@ -751,3 +751,4 @@ tt+$	xxxtt	y	-	-
 '^\S\s+aa$'m	\nx aa	y	-	-
 (^|a)b	ab	y	-	-
 (?i)		y	-	-
+'(?!\A)x'm	a\nxb\n	y	-	-
diff --git a/t/op/wantarray.t b/t/op/wantarray.t
index 0a47b6d3ba..4b6f37cf0f 100755
--- a/t/op/wantarray.t
+++ b/t/op/wantarray.t
@@ -1,6 +1,6 @@
 #!./perl
 
-print "1..3\n";
+print "1..7\n";
 sub context {
   my ( $cona, $testnum ) = @_;
   my $conb = (defined wantarray) ? ( wantarray ? 'A' : 'S' ) : 'V';
@@ -13,4 +13,8 @@ sub context {
 context('V',1);
 $a = context('S',2);
 @a = context('A',3);
+scalar context('S',4);
+$a = scalar context('S',5);
+($a) = context('A',6);
+($a) = scalar context('S',7);
 1;