Change 11500 by pudge@pudge-mobile on 2001/07/30 12:41:11

        Integrate miscellaneous changes from maint-5.6/perl.

Affected files ...

... //depot/maint-5.6/macperl/MANIFEST#2 integrate
... //depot/maint-5.6/macperl/t/TEST#2 integrate
... //depot/maint-5.6/macperl/t/harness#3 integrate
... //depot/maint-5.6/macperl/t/pod/testp2pt.pl#3 integrate
... //depot/maint-5.6/macperl/t/run/runenv.t#2 integrate

Differences ...

==== //depot/maint-5.6/macperl/MANIFEST#2 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST.~1~   Mon Jul 30 06:45:05 2001
+++ perl/MANIFEST       Mon Jul 30 06:45:05 2001
@@ -1338,6 +1338,7 @@
 t/lib/filecache.t      See if FileCache works
 t/lib/filecopy.t       See if File::Copy works
 t/lib/filefind.t       See if File::Find works
+t/lib/filefind-taint.t See if File::Find works
 t/lib/filefunc.t       See if File::Spec::Functions works
 t/lib/filehand.t       See if FileHandle works
 t/lib/filepath.t       See if File::Path works

==== //depot/maint-5.6/macperl/t/TEST#2 (xtext) ====
Index: perl/t/TEST
--- perl/t/TEST.~1~     Mon Jul 30 06:45:05 2001
+++ perl/t/TEST Mon Jul 30 06:45:05 2001
@@ -24,7 +24,7 @@
 
 if ($#ARGV == -1) {
     @ARGV = split(/[ \n]/,
-      `echo base/*.t comp/*.t cmd/*.t run/*.t io/*.t; echo op/*.t pragma/*.t 
lib/*.t`);
+      `echo base/*.t comp/*.t cmd/*.t run/*.t io/*.t; echo op/*.t pragma/*.t lib/*.t 
+pod/*.t`);
 }
 
 # %infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 ); 

==== //depot/maint-5.6/macperl/t/harness#3 (xtext) ====
Index: perl/t/harness
--- perl/t/harness.~1~  Mon Jul 30 06:45:05 2001
+++ perl/t/harness      Mon Jul 30 06:45:05 2001
@@ -38,7 +38,8 @@
 }
 
 @tests = @ARGV;
-@tests = <base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t lib/*.t> unless @tests;
+@tests = <base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t pragma/*.t lib/*.t pod/*.t>
+    unless @tests;
 
 Test::Harness::runtests @tests;
 exit(0) unless -e "../testcompile";

==== //depot/maint-5.6/macperl/t/pod/testp2pt.pl#3 (text) ====
Index: perl/t/pod/testp2pt.pl
--- perl/t/pod/testp2pt.pl.~1~  Mon Jul 30 06:45:05 2001
+++ perl/t/pod/testp2pt.pl      Mon Jul 30 06:45:05 2001
@@ -48,8 +48,7 @@
     $INSTDIR =~ s#/000000/#/#;
 }
 
-my $rm_dir = File::Spec->catdir('t', 'pod');
-$INSTDIR =~ s/$rm_dir$//; # cut 't/pod' from path (cut 't:pod:' on Mac OS) 
+$INSTDIR =~ s{t[/\\:]pod$}{}i; # cut 't/pod' from path (cut 't:pod:' on Mac OS) 
 
 my @PODINCDIRS = ( catfile($INSTDIR, 'lib', 'Pod'),
                    catfile($INSTDIR, 'scripts'),

==== //depot/maint-5.6/macperl/t/run/runenv.t#2 (xtext) ====
Index: perl/t/run/runenv.t
--- perl/t/run/runenv.t.~1~     Mon Jul 30 06:45:05 2001
+++ perl/t/run/runenv.t Mon Jul 30 06:45:05 2001
@@ -14,6 +14,8 @@
     }
 }
 
+$| = 1 unless $Config{fflushNULL};   # some platforms can't autoflush on fork()
+
 my $STDOUT = './results-0';
 my $STDERR = './results-1';
 my $PERL = './perl';
End of Patch.

Reply via email to