I've just stumbled again across these failures on FreeBSD 6.4.

> FreeBSD 6.4:
> 
> test-rename.h:342: assertion failed
> Abort trap (core dumped)
> FAIL: test-rename
> 
> test-rename.h:342: assertion failed
> Abort trap (core dumped)
> FAIL: test-renameat

Jim, you've usually OKed added other errno values to the list of expected
error values. This is the minimal fix.


2011-09-18  Bruno Haible  <br...@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.

--- tests/test-rename.h.orig    Mon Sep 19 00:33:28 2011
+++ tests/test-rename.h Mon Sep 19 00:22:45 2011
@@ -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;
--- tests/test-renameat.c.orig  Mon Sep 19 00:33:28 2011
+++ tests/test-renameat.c       Mon Sep 19 00:33:20 2011
@@ -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);

-- 
In memoriam Bernhard Bästlein <http://en.wikipedia.org/wiki/Bernhard_Bästlein>

Reply via email to