Change 16305 by jhi@alpha on 2002/05/01 13:16:12
Subject: [PATCH: perl@16267] make lib/User/pwent.t run on VMS
From: [EMAIL PROTECTED]
Date: Wed, 1 May 2002 10:12:53 -0400
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/lib/User/pwent.t#4 edit
Differences ...
==== //depot/perl/lib/User/pwent.t#4 (text) ====
Index: perl/lib/User/pwent.t
--- perl/lib/User/pwent.t.~1~ Wed May 1 07:30:05 2002
+++ perl/lib/User/pwent.t Wed May 1 07:30:05 2002
@@ -11,13 +11,18 @@
$haspw = 1 unless $@ && $@ =~ /unimplemented/;
unless ($haspw) { print "1..0 # Skip: no getpwuid\n"; exit 0 }
use Config;
- $haspw = 0 unless $Config{'i_pwd'} eq 'define';
+ # VMS's pwd.h struct passwd conflicts with the one in vmsish.h
+ $haspw = 0 unless ( $Config{'i_pwd'} eq 'define' || $^O eq 'VMS' );
unless ($haspw) { print "1..0 # Skip: no pwd.h\n"; exit 0 }
}
BEGIN {
- our @pwent = getpwuid 0; # This is the function getpwuid.
- unless (@pwent) { print "1..0 # Skip: no uid 0\n"; exit 0 }
+ our $uid = 0;
+ # On VMS getpwuid(0) may return [$gid,0] UIC info (which may not exist).
+ # It is better to use the $< uid for testing on VMS instead.
+ if ( $^O eq 'VMS' ) { $uid = $< ; }
+ our @pwent = getpwuid $uid; # This is the function getpwuid.
+ unless (@pwent) { print "1..0 # Skip: no uid $uid\n"; exit 0 }
}
print "1..9\n";
@@ -26,10 +31,12 @@
print "ok 1\n";
-my $pwent = getpwuid 0; # This is the OO getpwuid.
+my $pwent = getpwuid $uid; # This is the OO getpwuid.
+
+my $uid_expect = $uid;
+if ( $^O eq 'cygwin' ) { $uid_expect = 500; } # go figure
-print "not " unless $pwent->uid == 0 ||
- ($^O eq 'cygwin' && $pwent->uid == 500); # go figure
+print "not " unless $pwent->uid == $uid_expect ;
print "ok 2\n";
print "not " unless $pwent->name eq $pwent[0];
End of Patch.
