From: Jim Meyering <jim@meyering.net>
Date: Sun, 9 Jul 2006 17:48:08 +0000 (+0000)
Subject: Adjust so failing with ENOTEMPTY is ok, too.
X-Git-Tag: v6.0~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=159f93015862c8ef435c101f4d76c1ab03e692c0;p=thirdparty%2Fcoreutils.git

Adjust so failing with ENOTEMPTY is ok, too.
That happens with Linux/tmpfs.
---

diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir
index 3f865bc1d8..189b4f9910 100755
--- a/tests/mv/dir2dir
+++ b/tests/mv/dir2dir
@@ -35,8 +35,11 @@ fail=0
 # diagnostic about moving one directory to a subdirectory of itself.
 mv b/t a 2> out && fail=1
 
+# Accept either EEXIST or ENOTEMPTY.
+sed 's/: File exists/: Directory not empty/'<out>o1;mv o1 out
+
 cat <<\EOF > exp || fail=1
-mv: cannot move `b/t' to `a/t': File exists
+mv: cannot move `b/t' to `a/t': Directory not empty
 EOF
 
 cmp out exp || fail=1