# HG changeset patch
# User Eric Blake <eblake@redhat.com>
# Date 1303853003 21600
# Node ID 4843b6870f0769f3ee0330bf9ed61c8bc78f98c0
# Parent  477dcbd7cb5d36cc83240f08827eebaf1fee2f20
tests: reduce dependencies

We can assume that tests won't be run from a directory with an
absolute name longer than native getcwd limits.

* tests/test-linkat.c (main): Use lighter-weight getcwd.
* tests/test-renameat.c (main): Likewise.
* modules/linkat-tests (Depends-on): Relax dependency.
* modules/renameat-tests (Depends-on): Likewise.
* modules/fchdir-tests (Depends-on): Likewise.  Also make cloexec
dependency explicit.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-04-27  Eric Blake  <eblake@redhat.com>
 
+	tests: reduce dependencies
+	* tests/test-linkat.c (main): Use lighter-weight getcwd.
+	* tests/test-renameat.c (main): Likewise.
+	* modules/linkat-tests (Depends-on): Relax dependency.
+	* modules/renameat-tests (Depends-on): Likewise.
+	* modules/fchdir-tests (Depends-on): Likewise.  Also make cloexec
+	dependency explicit.
+
 	save-cwd: reduce default dependency
 	* modules/save-cwd (Depends-on): Use getcwd-lgpl.
 	* lib/save-cwd.c: Update comments.
diff --git a/modules/fchdir-tests b/modules/fchdir-tests
--- a/modules/fchdir-tests
+++ b/modules/fchdir-tests
@@ -4,7 +4,8 @@
 tests/macros.h
 
 Depends-on:
-getcwd
+cloexec
+getcwd-lgpl
 
 configure.ac:
 
diff --git a/modules/linkat-tests b/modules/linkat-tests
--- a/modules/linkat-tests
+++ b/modules/linkat-tests
@@ -8,9 +8,9 @@
 ignore-value
 areadlink-with-size
 filenamecat
+getcwd-lgpl
 progname
 same-inode
-xgetcwd
 
 configure.ac:
 
diff --git a/modules/renameat-tests b/modules/renameat-tests
--- a/modules/renameat-tests
+++ b/modules/renameat-tests
@@ -7,8 +7,8 @@
 Depends-on:
 ignore-value
 filenamecat
+getcwd-lgpl
 progname
-xgetcwd
 
 configure.ac:
 
diff --git a/tests/test-linkat.c b/tests/test-linkat.c
--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -34,7 +34,6 @@
 #include "areadlink.h"
 #include "filenamecat.h"
 #include "same-inode.h"
-#include "xgetcwd.h"
 #include "ignore-value.h"
 #include "macros.h"
 
@@ -119,7 +118,8 @@
   ASSERT (mkdir (BASE "sub1", 0700) == 0);
   ASSERT (mkdir (BASE "sub2", 0700) == 0);
   ASSERT (close (creat (BASE "00", 0600)) == 0);
-  cwd = xgetcwd ();
+  cwd = getcwd (NULL, 0);
+  ASSERT (cwd);
 
   dfd = open (BASE "sub1", O_RDONLY);
   ASSERT (0 <= dfd);
diff --git a/tests/test-renameat.c b/tests/test-renameat.c
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -33,7 +33,6 @@
 #include <sys/stat.h>
 
 #include "filenamecat.h"
-#include "xgetcwd.h"
 #include "ignore-value.h"
 #include "macros.h"
 
@@ -79,7 +78,8 @@
   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);