From: Pádraig Brady <P@draigBrady.com>
Date: Thu, 22 Nov 2012 10:36:31 +0000 (+0000)
Subject: tests: accept EEXIST from rm -d
X-Git-Tag: v8.21~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac673a577aa78fec7b838a8fe727f41bd56bbe3;p=thirdparty%2Fcoreutils.git

tests: accept EEXIST from rm -d

* tests/rm/d-2.sh: EEXIST is a valid error on some systems.
Reported by Michael Felt on AIX 6.1
---

diff --git a/tests/rm/d-2.sh b/tests/rm/d-2.sh
index b62c2ee71a..1a1a5601b8 100755
--- a/tests/rm/d-2.sh
+++ b/tests/rm/d-2.sh
@@ -24,10 +24,14 @@ mkdir d || framework_failure_
 > d/a || framework_failure_
 
 rm -d d 2> out && fail=1
+
+# Accept any of these: EEXIST, ENOTEMPTY
+sed 's/: File exists/: Directory not empty/' out > out2
+
 printf "%s\n" \
     "rm: cannot remove 'd': Directory not empty" \
     > exp || framework_failure_
 
-compare exp out || fail=1
+compare exp out2 || fail=1
 
 Exit $fail