From: Jim Meyering <jim@meyering.net>
Date: Tue, 28 Nov 2006 08:21:00 +0000 (+0100)
Subject: * tests/mv/dir2dir: Also accept EBUSY.
X-Git-Tag: COREUTILS-6_7~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db7092bed3d172f7033dab05b62ad131046f1bf3;p=platform%2Fupstream%2Fcoreutils.git

* tests/mv/dir2dir: Also accept EBUSY.
Reported by Matthew Woehlke.
---

diff --git a/ChangeLog b/ChangeLog
index 5249da1..67fd95e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-28  Jim Meyering  <jim@meyering.net>
+
+	* tests/mv/dir2dir: Also accept EBUSY.
+	Reported by Matthew Woehlke.
+
 2006-11-27  Jim Meyering  <jim@meyering.net>
 
 	* Makefile.maint (patch-check): Rewrite to diagnose failure.
diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir
index 8518a62..11ae26e 100755
--- a/tests/mv/dir2dir
+++ b/tests/mv/dir2dir
@@ -52,8 +52,9 @@ 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
+# Accept any of these: EEXIST, ENOTEMPTY, EBUSY.
+sed             's/: File exists/: Directory not empty/'<out>o1;mv o1 out
+sed 's/: Device or resource busy/: Directory not empty/'<out>o1;mv o1 out
 
 cat <<\EOF > exp || fail=1
 mv: cannot move `b/t' to `a/t': Directory not empty