From: Jim Meyering <jim@meyering.net>
Date: Sat, 22 Jun 2002 06:49:57 +0000 (+0000)
Subject: Accommodate the  slightly different diagnostic we
X-Git-Tag: FILEUTILS-4_1_9~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d04e0b63cba4c1120901eba4e8605721a28b5fb;p=thirdparty%2Fcoreutils.git

Accommodate the  slightly different diagnostic we
get on some systems, due to `unlink (dir)' failing with EACCES
rather than EPERM.  E.g. for ReiserFS on Linux-2.4.18.
---

diff --git a/tests/rm/rm1 b/tests/rm/rm1
index 8bcd6fd04a..01dc3c2dfe 100755
--- a/tests/rm/rm1
+++ b/tests/rm/rm1
@@ -34,7 +34,15 @@ cat <<\EOF > exp
 rm: cannot remove directory `b/a/p': Permission denied
 EOF
 
-cmp out exp || fail=1
+# On some systems, rm doesn't have enough information to
+# say it's a directory.
+cat <<\EOF > exp2
+rm: cannot remove `b/a/p': Permission denied
+EOF
+
+cmp out exp > /dev/null 2>&1 || {
+  cmp out exp2 || fail=1
+  }
 test $fail = 1 && diff out exp 2> /dev/null
 
 test -d b/a/p || fail=1