test-rmdir on HP-UX 10.20

[Bruno Haible]

Hi Eric,

Ralf Wildenhues wrote on 2010-08-25 in
<http://lists.gnu.org/archive/html/bug-gnulib/2010-08/msg00184.html>:
>     Fix test-unlinkat, test-rmdir failure on AIX 5.3.
>     
>     * tests/test-rmdir.h: Also accept EEXIST for
>     rmdir ("dir/.//"), unlinkat.
> 
> diff --git a/tests/test-rmdir.h b/tests/test-rmdir.h
> index 6d5d56e..e9e625f 100644
> --- a/tests/test-rmdir.h
> +++ b/tests/test-rmdir.h
> @@ -66,7 +66,7 @@ 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);
> +  ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST);
>    ASSERT (func (BASE "dir") == 0);
>  
>    /* Test symlink behavior.  Specifying trailing slash should remove

Similarly, on HP-UX 10.20 I observe this failure:

  test-rmdir.h:69: assertion failed
  FAIL: test-rmdir

This fixes it. OK to apply?


2011-05-08  Bruno Haible  <address@hidden>

        rmdir: Avoid test failure on HP-UX 10.20.
        * tests/test-rmdir.h (test_rmdir_func): Accept ENOTEMPTY error, like
        EEXIST.

--- tests/test-rmdir.h.orig     Wed Jun  8 22:59:55 2011
+++ tests/test-rmdir.h  Wed Jun  8 22:56:13 2011
@@ -66,7 +66,8 @@
   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


-- 
In memoriam Larisa Yudina <http://en.wikipedia.org/wiki/Larisa_Yudina>