X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-renameat.c;h=eba8e161faf7aa2ca52f2c7cea550b8d67318fc4;hb=d6e564567eb4ab3033d8e08c8467e3d1a3f51c0d;hp=de84fa6764c61de0eda7abecc40fb7b29bdc771a;hpb=987e5651e8d1c5aa933c9ce88562806af4093702;p=gnulib.git

diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index de84fa676..eba8e161f 100644
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -1,5 +1,5 @@
 /* Tests of renameat.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,15 +23,17 @@
 #include "signature.h"
 SIGNATURE_CHECK (renameat, int, (int, char const *, int, char const *));
 
+#include <dirent.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include "filenamecat.h"
-#include "xgetcwd.h"
+#include "ignore-value.h"
 #include "macros.h"
 
 #define BASE "test-renameat.t"
@@ -57,7 +59,7 @@ main (void)
   int result;
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  ignore_value (system ("rm -rf " BASE "*"));
 
   /* Test basic rename functionality, using current directory.  */
   result = test_rename (do_rename, false);
@@ -76,7 +78,8 @@ main (void)
   dfd = creat (BASE "00", 0600);
   ASSERT (0 <= dfd);
   ASSERT (close (dfd) == 0);
-  cwd = xgetcwd ();
+  cwd = getcwd (NULL, 0);
+  ASSERT (cwd);
 
   dfd = open (BASE "sub1", O_RDONLY);
   ASSERT (0 <= dfd);
@@ -127,10 +130,10 @@ 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);
+  ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST);
   errno = 0;
   ASSERT (renameat (dfd, BASE "17", dfd, BASE "sub1") == -1);
   ASSERT (errno == EISDIR);