test-linkat: make test more robust

* tests/test-linkat.c (main): Avoid collision with EEXIST.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 35f84c42eda62214062fa4bbe8bf2e1fdde282d0..76978025ec95e1a0845358dfbc999e0b6ba53167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-24  Eric Blake  <ebb9@byu.net>
 
+       test-linkat: make test more robust
+       * tests/test-linkat.c (main): Avoid collision with EEXIST.
+
        getopt: fix inclusion guards for cygwin
        * modules/getopt-posix (Depends-on): Add include-next.
        (Makefile.am): Substitute more items in replacement header.

diff --git a/tests/test-linkat.c b/tests/test-linkat.c
index afb17994127aaac39e2813348740918910fe1dee..f5c4c77619d28b3b23fff6de39b3e55cb8b49a5e 100644 (file)
--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -302,6 +302,7 @@ main ()
   errno = 0;
   ASSERT (areadlink (BASE "file") == NULL);
   ASSERT (errno == EINVAL);
+  ASSERT (unlink (BASE "file") == 0);
   ASSERT (unlink (BASE "link5") == 0);
   ASSERT (symlink (BASE "link3", BASE "link5") == 0);
   errno = 0;
@@ -346,7 +347,6 @@ main ()
   ASSERT (unlink (BASE "link3") == 0);
   ASSERT (unlink (BASE "link4") == 0);
   ASSERT (unlink (BASE "link5") == 0);
-  ASSERT (unlink (BASE "file") == 0);
   free (cwd);
   return result;
 }