rename, renameat: Avoid test failures on OSF/1 5.1.

* tests/test-rename.h (test_rename): Allow EEXIST and ENOTDIR as
alternative error codes.
* tests/test-renameat.c (main): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 038e38b..4bfe710 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-24  Bruno Haible  <bruno@clisp.org>
 
+       rename, renameat: Avoid test failures on OSF/1 5.1.
+       * tests/test-rename.h (test_rename): Allow EEXIST and ENOTDIR as
+       alternative error codes.
+       * tests/test-renameat.c (main): Likewise.
+
+2010-12-24  Bruno Haible  <bruno@clisp.org>
+
        *printf: Detect large precisions bug on Solaris 10/SPARC.
        * m4/printf.m4 (gl_PRINTF_PRECISION): Add one more test code, provided
        by Paul Eggert.

diff --git a/tests/test-rename.h b/tests/test-rename.h
index c9437c4..475ded0 100644 (file)
--- 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);
+        ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST);
       }
       ASSERT (rmdir (BASE "dir") == 0);
       /* Files present here:
@@ -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);
+        ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST);
       }
       ASSERT (rmdir (BASE "dir2") == 0);
       /* Files present here:
@@ -914,7 +914,7 @@ test_rename (int (*func) (char const *, char const *), bool print)
         if (result) /* GNU/Linux rejects attempts to use link2/.  */
           {
             ASSERT (result == -1);
-            ASSERT (errno == ENOTDIR);
+            ASSERT (errno == ENOTDIR || errno == EISDIR);
           }
         memset (&st, 0, sizeof st);
         ASSERT (lstat (BASE "dir", &st) == 0);

diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index f9a5611..774bfdf 100644 (file)
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -133,7 +133,7 @@ main (void)
           || errno == ENOTEMPTY);
   errno = 0;
   ASSERT (renameat (dfd, BASE "sub2/.", dfd, BASE "sub1") == -1);
-  ASSERT (errno == EINVAL || errno == EBUSY);
+  ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST);
   errno = 0;
   ASSERT (renameat (dfd, BASE "17", dfd, BASE "sub1") == -1);
   ASSERT (errno == EISDIR);