summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-06-09 11:21:23 +0200
committerBruno Haible <bruno@clisp.org>2011-06-09 11:21:23 +0200
commit363971609279e4941f32dc4dcbc3155c763317af (patch)
tree17a2cfc059ab8a06b8b58636b11f479cec61eda4
parente73b278d326a9707a8d167fd48a78093051e964d (diff)
downloadgnulib-363971609279e4941f32dc4dcbc3155c763317af.tar.gz
rmdir: Avoid test failure on HP-UX 10.20.
* tests/test-rmdir.h (test_rmdir_func): Accept ENOTEMPTY error, like EEXIST.
-rw-r--r--ChangeLog6
-rw-r--r--tests/test-rmdir.h3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0faf040dd3..b50223d485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-09 Bruno Haible <bruno@clisp.org>
+
+ rmdir: Avoid test failure on HP-UX 10.20.
+ * tests/test-rmdir.h (test_rmdir_func): Accept ENOTEMPTY error, like
+ EEXIST.
+
2011-06-08 Eric Blake <eblake@redhat.com>
perror: fix test on mingw
diff --git a/tests/test-rmdir.h b/tests/test-rmdir.h
index 757d030638..476b307d10 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