X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Ffiletest.t;h=98a19bdf5fd44b53d22138c8d23571ba7bb5c509;hb=325920419806eaa4eb741cfaa547d3fbbbe03f5f;hp=02879c37028ad59548a14789e876136ff8a33993;hpb=3acb6bcd1a901f84bfce64680bedea321811824a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/filetest.t b/lib/filetest.t
index 02879c3..98a19bd 100644
--- a/lib/filetest.t
+++ b/lib/filetest.t
@@ -5,7 +5,8 @@ BEGIN {
 	@INC = '../lib';
 }
 
-use Test::More tests => 13;
+use Config;
+use Test::More tests => 15;
 
 # these two should be kept in sync with the pragma itself
 # if hint bits are changed there, other things *will* break
@@ -57,27 +58,38 @@ SKIP: {
     my $tstfile = "filetest.tst";
     skip("No $chflags available", 4) if !-x $chflags;
 
- SKIP: {
-	eval {
-	    if (!-e $tstfile) {
-		open(T, ">$tstfile") or die "Can't create $tstfile: $!";
-		close T;
-	    }
-	    system($chflags, "uchg", $tstfile);
-	    die "Can't exec $chflags uchg" if $? != 0;
-	};
-	skip("Errors in test using chflags: $@", 4) if $@;
-
-	{
-	    use filetest 'access';
+    my $skip_eff_user_tests = (!$Config{d_setreuid} && !$Config{d_setresuid})
+	                                            ||
+			      (!$Config{d_setregid} && !$Config{d_setresgid});
+
+    eval {
+	if (!-e $tstfile) {
+	    open(T, ">$tstfile") or die "Can't create $tstfile: $!";
+	    close T;
+	}
+	system($chflags, "uchg", $tstfile);
+	die "Can't exec $chflags uchg" if $? != 0;
+    };
+    skip("Errors in test using chflags: $@", 4) if $@;
+
+    {
+	use filetest 'access';
+    SKIP: {
+	    skip("No tests on effective user id", 1)
+		if $skip_eff_user_tests;
 	    is(-w $tstfile, undef, "$tstfile should not be recognized as writable");
-	    is(-W $tstfile, undef, "$tstfile should not be recognized as writable");
 	}
-	{
-	    no filetest 'access';
+	is(-W $tstfile, undef, "$tstfile should not be recognized as writable");
+    }
+
+    {
+	no filetest 'access';
+    SKIP: {
+	    skip("No tests on effective user id", 1)
+		if $skip_eff_user_tests;
 	    is(-w $tstfile, 1, "$tstfile should be recognized as writable");
-	    is(-W $tstfile, 1, "$tstfile should be recognized as writable");
 	}
+	is(-W $tstfile, 1, "$tstfile should be recognized as writable");
     }
 
     # cleanup