--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-18  Bruno Haible  <bruno@clisp.org>
+
+	rename, renameat tests: Avoid test failures on FreeBSD 6.4.
+	* tests/test-rename.h (test_rename): Allow error code EEXIST.
+	* tests/test-renameat.c (main): Likewise.
+
 2011-09-18  Bruno Haible  <bruno@clisp.org>
 
 	Tests for module 'accept4'.

--- a/tests/test-rename.h
+++ b/tests/test-rename.h
@@ -339,7 +339,7 @@
         errno = 0;
         ASSERT (func (BASE "dir2", BASE "dir/.") == -1);
         ASSERT (errno == EINVAL || errno == EBUSY || errno == EISDIR
-                || errno == ENOTEMPTY);
+                || errno == ENOTEMPTY || errno == EEXIST);
       }
       {
         errno = 0;
@@ -366,7 +366,7 @@
         errno = 0;
         ASSERT (func (BASE "dir2", BASE "dir/.//") == -1);
         ASSERT (errno == EINVAL || errno == EBUSY || errno == EISDIR
-                || errno == ENOTEMPTY);
+                || errno == ENOTEMPTY || errno == EEXIST);
       }
       {
         errno = 0;

--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -130,7 +130,7 @@
   errno = 0;
   ASSERT (renameat (dfd, BASE "sub2", dfd, BASE "sub1/.") == -1);
   ASSERT (errno == EINVAL || errno == EISDIR || errno == EBUSY
-          || errno == ENOTEMPTY);
+          || errno == ENOTEMPTY || errno == EEXIST);
   errno = 0;
   ASSERT (renameat (dfd, BASE "sub2/.", dfd, BASE "sub1") == -1);
   ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST);