From 55b092cac1b884d967124f0235d3ba11941d5954 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 19 Sep 2011 00:35:39 +0200 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ tests/test-rename.h | 4 ++-- tests/test-renameat.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 030ad41d6..60411e11c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-09-18 Bruno Haible + 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 + 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 64bab0964..8825f73c2 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 96fe3a755..eba8e161f 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); -- 2.11.0