summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xtests/mv/dir2dir5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5249da193..67fd95e17 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 8518a6220..11ae26ed1 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