PERFORCE change 11206 for review

Change 11206 by pudge@pudge-mobile on 2001/07/08 00:56:29

	Bugfixes for some tests.  commonsense.t not in perl 5.6,
	used in File::Find tests; replace with if.t.

Affected files ...

... //depot/maint-5.6/macperl/t/lib/filefind-taint.t#2 edit
... //depot/maint-5.6/macperl/t/lib/filefind.t#4 edit
... //depot/maint-5.6/macperl/t/op/taint.t#3 edit
... //depot/maint-5.6/macperl/t/pragma/warn/op#3 edit

Differences ...

==== //depot/maint-5.6/macperl/t/lib/filefind-taint.t#2 (text) ====
Index: perl/t/lib/filefind-taint.t
--- perl/t/lib/filefind-taint.t.~1~	Sat Jul  7 19:00:05 2001
+++ perl/t/lib/filefind-taint.t	Sat Jul  7 19:00:05 2001
@@ -8,12 +8,12 @@
 my $cwd;
 my $cwd_untainted;
 
-use Config;
-
 BEGIN {
     chdir 't' if -d 't';
     unshift @INC => '../lib';
 
+    require Config;
+
     for (keys %ENV) { # untaint ENV
 	($ENV{$_}) = $ENV{$_} =~ /(.*)/;
     }
@@ -48,10 +48,10 @@
 
 cleanup();
 
-find({wanted => sub { print "ok 1\n" if $_ eq 'commonsense.t'; },
+find({wanted => sub { print "ok 1\n" if $_ eq 'if.t'; },
       untaint => 1, untaint_pattern => qr|^(.+)$|}, File::Spec->curdir);
 
-finddepth({wanted => sub { print "ok 2\n" if $_ eq 'commonsense.t'; },
+finddepth({wanted => sub { print "ok 2\n" if $_ eq 'if.t'; },
            untaint => 1, untaint_pattern => qr|^(.+)$|},
            File::Spec->curdir);
 

==== //depot/maint-5.6/macperl/t/lib/filefind.t#4 (xtext) ====
Index: perl/t/lib/filefind.t
--- perl/t/lib/filefind.t.~1~	Sat Jul  7 19:00:05 2001
+++ perl/t/lib/filefind.t	Sat Jul  7 19:00:05 2001
@@ -30,10 +30,10 @@
 
 cleanup();
 
-find({wanted => sub { print "ok 1\n" if $_ eq 'commonsense.t'; } },
+find({wanted => sub { print "ok 1\n" if $_ eq 'if.t'; } },
    File::Spec->curdir);
 
-finddepth({wanted => sub { print "ok 2\n" if $_ eq 'commonsense.t'; } },
+finddepth({wanted => sub { print "ok 2\n" if $_ eq 'if.t'; } },
 	File::Spec->curdir);
 
 my $case = 2;

==== //depot/maint-5.6/macperl/t/op/taint.t#3 (xtext) ====
Index: perl/t/op/taint.t
--- perl/t/op/taint.t.~1~	Sat Jul  7 19:00:05 2001
+++ perl/t/op/taint.t	Sat Jul  7 19:00:05 2001
@@ -587,7 +587,7 @@
 	unlink($symlink);
 	my $sl = "/something/naughty";
 	# it has to be a real path on Mac OS
-	$sl = MacPerl::MakePath((MacPerl::Volumes)[0]) if $Is_MacOS;
+	$sl = MacPerl::MakePath((MacPerl::Volumes())[0]) if $Is_MacOS;
 	symlink($sl, $symlink) or die "symlink: $!\n";
 	my $readlink = readlink($symlink);
 	test 144, tainted $readlink;

==== //depot/maint-5.6/macperl/t/pragma/warn/op#3 (text) ====
Index: perl/t/pragma/warn/op
--- perl/t/pragma/warn/op.~1~	Sat Jul  7 19:00:05 2001
+++ perl/t/pragma/warn/op	Sat Jul  7 19:00:05 2001
@@ -754,7 +754,7 @@
 exec "$^X -e 1" ; 
 my $a
 EXPECT
-Statement unlikely to be reached at - line 4.
+Statement unlikely to be reached at - line 10.
 	(Maybe you meant system() when you said exec()?)
 ########
 # op.c
End of Patch.