From: Jim Meyering <meyering@redhat.com>
Date: Wed, 24 Oct 2007 06:50:09 +0000 (+0200)
Subject: Don't fail part 2 of tests/rm/unreadable when run as root.
X-Git-Tag: v6.9.89~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b924d0380eefddc4a6dd5b8521b91c3a4bc4527a;p=thirdparty%2Fcoreutils.git

Don't fail part 2 of tests/rm/unreadable when run as root.

* tests/rm/unreadable: With UID == 0, expect different results.
Reported by Mike Frysinger.
---

diff --git a/ChangeLog b/ChangeLog
index 61ff641010..2757dff4a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-24  Jim Meyering  <meyering@redhat.com>
+
+	Don't fail part 2 of tests/rm/unreadable when run as root.
+	* tests/rm/unreadable: With UID == 0, expect different results.
+	Reported by Mike Frysinger.
+
 2007-10-23  Jim Meyering  <meyering@redhat.com>
 
 	* README-hacking: Refer to LZMA Utils <http://tukaani.org/lzma/>.
diff --git a/tests/rm/unreadable b/tests/rm/unreadable
index 2fbe0320d8..4af8280de2 100755
--- a/tests/rm/unreadable
+++ b/tests/rm/unreadable
@@ -38,6 +38,7 @@ use strict;
 my $d = "dir-$$";
 my $mkdir = {PRE => sub {mkdir $d,0100 or die "$d: $!\n"}};
 my $prog = 'rm';
+my $uid = $<;
 
 my @Tests =
     (
@@ -47,8 +48,9 @@ my @Tests =
      ['unreadable-1', '-rf', $d, {EXIT => 0}, $mkdir],
 
      ['unreadable-2', '-rf', $d,
-      {EXIT => 1},
-      {ERR => "$prog: cannot remove \`$d': Permission denied\n"},
+      {EXIT => $uid == 0 ? 0 : 1},
+      {ERR => $uid == 0 ? ''
+                        : "$prog: cannot remove \`$d': Permission denied\n"},
       {PRE => sub { (mkdir $d,0700 and mkdir "$d/x",0700 and chmod 0100,$d)
                     or die "$d: $!\n"}} ],
     );