X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fgrent.t;h=9b06f11a3e29be84593eef010de906d5c429ea13;hb=45c0de28763808112fd2f46ea311b6bb0c6050b3;hp=abe6b5add0938e351b6a9964708bcc4312b7a13c;hpb=aa854799af20b80973df4e295167b2fda1fc7a9c;p=p5sagit%2Fp5-mst-13.2.git diff --git a/t/op/grent.t b/t/op/grent.t index abe6b5a..9b06f11 100755 --- a/t/op/grent.t +++ b/t/op/grent.t @@ -4,12 +4,12 @@ BEGIN { chdir 't' if -d 't'; unshift @INC, "../lib" if -d "../lib"; eval { require Config; import Config; }; - - unless (defined $Config{'i_grp'} && - $Config{'i_grp'} eq 'define' && - -f "/etc/group" ) { # Play safe. - print "1..0\n"; - exit 0; + my $reason; + if ($Config{'i_grp'} ne 'define') { + $reason = '$Config{i_grp} not defined'; + } + elsif (not -f "/etc/group" ) { # Play safe. + $reason = 'no /etc/group file'; } if (not defined $where) { # Try NIS. @@ -18,6 +18,7 @@ BEGIN { open(GR, "$ypcat group 2>/dev/null |") && defined()) { $where = "NIS group"; + undef $reason; last; } } @@ -29,6 +30,7 @@ BEGIN { open(GR, "$nidump group . 2>/dev/null |") && defined()) { $where = "NetInfo group"; + undef $reason; last; } } @@ -37,12 +39,12 @@ BEGIN { if (not defined $where) { # Try local. my $GR = "/etc/group"; if (-f $GR && open(GR, $GR) && defined()) { + undef $reason; $where = $GR; } } - - if (not defined $where) { # Give up. - print "1..0\n"; + if ($reason) { + print "1..0 # Skip: $reason\n"; exit 0; } }