From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 12 Dec 2001 01:44:39 +0000 (+0000)
Subject: (1) To assume any setuid programs is silly.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2304a331d828d984dee6ff19ca039ec99e00a365;p=p5sagit%2Fp5-mst-13.2.git

(1) To assume any setuid programs is silly.
(2) Chaining tests with booleans means that some
    of them may not get run which means getting out
    of test count sync.

p4raw-id: //depot/perl@13639
---

diff --git a/t/op/stat.t b/t/op/stat.t
index 79f9e29..a78670a 100755
--- a/t/op/stat.t
+++ b/t/op/stat.t
@@ -233,8 +233,6 @@ ok(! -c $Curdir,    '!-c cwd');
 ok(! -S $Curdir,    '!-S cwd');
 
 SKIP: {
-    skip "No setuid", 3 if $Is_MPE or $Is_Amiga or $Is_Dosish or $Is_Cygwin;
-
     my($cnt, $uid);
     $cnt = $uid = 0;
 
@@ -254,17 +252,11 @@ SKIP: {
     }
     closedir BIN;
 
-    if( !isnt($cnt, 0,    'found some programs') ||
-        !isnt($uid, 0,    'found some setuid programs') ||
-        !ok($uid < $cnt,  "  they're not all setuid") )
-    {
-        print <<DIAG;
-# The above two tests assume that at least one of these directories
-# are readable, executable and contain at least one setuid file
-# (but aren't all setuid).
-#   @bin
-DIAG
-    }
+    skip "No setuid programs", 3 if $uid == 0;
+
+    isnt($cnt, 0,    'found some programs');
+    isnt($uid, 0,    '  found some setuid programs');
+    ok($uid < $cnt,  "    they're not all setuid");
 }