From 74c0798885ffd380c8f208d7aea9bd27aa6e625e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 9 Jun 2011 11:21:23 +0200 Subject: [PATCH] rmdir: Avoid test failure on HP-UX 10.20. * tests/test-rmdir.h (test_rmdir_func): Accept ENOTEMPTY error, like EEXIST. (cherry picked from commit 363971609279e4941f32dc4dcbc3155c763317af) --- ChangeLog | 6 ++++++ tests/test-rmdir.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bebe05b31..e054ba88e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-06-09 Bruno Haible + + rmdir: Avoid test failure on HP-UX 10.20. + * tests/test-rmdir.h (test_rmdir_func): Accept ENOTEMPTY error, like + EEXIST. + 2011-06-07 Stefano Lattarini tests: fix usage message in 'mktempd_' diff --git a/tests/test-rmdir.h b/tests/test-rmdir.h index 757d03063..476b307d1 100644 --- a/tests/test-rmdir.h +++ b/tests/test-rmdir.h @@ -66,7 +66,8 @@ test_rmdir_func (int (*func) (char const *name), bool print) ASSERT (unlink (BASE "dir/file") == 0); errno = 0; ASSERT (func (BASE "dir/.//") == -1); - ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST); + ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST + || errno == ENOTEMPTY); ASSERT (func (BASE "dir") == 0); /* Test symlink behavior. Specifying trailing slash should remove -- 2.11.0