summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/test-rename.h4
-rw-r--r--tests/test-renameat.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 030ad41d6e..60411e11c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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'.
* modules/accept4-tests: New file.
* tests/test-accept4.c: New file.
diff --git a/tests/test-rename.h b/tests/test-rename.h
index 64bab0964b..8825f73c27 100644
--- a/tests/test-rename.h
+++ b/tests/test-rename.h
@@ -339,7 +339,7 @@ test_rename (int (*func) (char const *, char const *), bool print)
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 @@ test_rename (int (*func) (char const *, char const *), bool print)
errno = 0;
ASSERT (func (BASE "dir2", BASE "dir/.//") == -1);
ASSERT (errno == EINVAL || errno == EBUSY || errno == EISDIR
- || errno == ENOTEMPTY);
+ || errno == ENOTEMPTY || errno == EEXIST);
}
{
errno = 0;
diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index 96fe3a7555..eba8e161fa 100644
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -130,7 +130,7 @@ main (void)
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);