--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2011-04-28  Eric Blake  <eblake@redhat.com>
 
+	tests: drop unused link dependency
+	* modules/areadlinkat-tests (Makefile.am): Drop stale LDADD.
+	* modules/dirent-safer-tests (Makefile.am): Likewise.
+	* modules/fdopendir-tests (Makefile.am): Likewise.
+	* modules/mkfifoat-tests (Makefile.am): Likewise.
+	* modules/openat-safer-tests (Makefile.am): Likewise.
+	* modules/openat-tests (Makefile.am): Likewise.
+	* modules/readlinkat-tests (Makefile.am): Likewise.
+	* modules/symlinkat-tests (Makefile.am): Likewise.
+	* modules/linkat-tests (Makefile.am): Likewise.
+	(Depends-on): Switch to filenamecat-lgpl.
+	* modules/fdutimensat-tests (test_fdutimensat_LDADD): Drop unused
+	LIBINTL.
+	* modules/utimensat-tests (test_utimensat_LDADD): Likewise.
+	* tests/test-linkat.c (main): Don't require xalloc.
+
 	hash, mgetgroups: drop xalloc dependency
 	* lib/hash.c (includes): Adjust includes.
 	* lib/mgetgroups.c (includes): Likewise.

--- a/modules/areadlinkat-tests
+++ b/modules/areadlinkat-tests
@@ -13,4 +13,3 @@
 Makefile.am:
 TESTS += test-areadlinkat
 check_PROGRAMS += test-areadlinkat
-test_areadlinkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/dirent-safer-tests
+++ b/modules/dirent-safer-tests
@@ -10,6 +10,3 @@
 Makefile.am:
 TESTS += test-dirent-safer
 check_PROGRAMS += test-dirent-safer
-# Link with libintl when needed. dirent-safer uses fdopendir if it is present,
-# and fdopendir indirectly depends on xgetcwd -> xalloc-die -> gettext-h.
-test_dirent_safer_LDADD = $(LDADD) $(LIBINTL)

--- a/modules/fdopendir-tests
+++ b/modules/fdopendir-tests
@@ -12,4 +12,3 @@
 Makefile.am:
 TESTS += test-fdopendir
 check_PROGRAMS += test-fdopendir
-test_fdopendir_LDADD = $(LDADD) @LIBINTL@

--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -19,4 +19,4 @@
 Makefile.am:
 TESTS += test-fdutimensat
 check_PROGRAMS += test-fdutimensat
-test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)

--- a/modules/linkat-tests
+++ b/modules/linkat-tests
@@ -7,7 +7,7 @@
 Depends-on:
 ignore-value
 areadlink-with-size
-filenamecat
+filenamecat-lgpl
 getcwd-lgpl
 progname
 same-inode
@@ -17,4 +17,3 @@
 Makefile.am:
 TESTS += test-linkat
 check_PROGRAMS += test-linkat
-test_linkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/mkfifoat-tests
+++ b/modules/mkfifoat-tests
@@ -13,4 +13,3 @@
 Makefile.am:
 TESTS += test-mkfifoat
 check_PROGRAMS += test-mkfifoat
-test_mkfifoat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/openat-safer-tests
+++ b/modules/openat-safer-tests
@@ -9,4 +9,3 @@
 Makefile.am:
 TESTS += test-openat-safer
 check_PROGRAMS += test-openat-safer
-test_openat_safer_LDADD = $(LDADD) @LIBINTL@

--- a/modules/openat-tests
+++ b/modules/openat-tests
@@ -31,8 +31,3 @@
 TESTS += test-fchownat test-fstatat test-mkdirat test-openat test-unlinkat
 check_PROGRAMS += test-fchownat test-fstatat test-mkdirat test-openat \
   test-unlinkat
-test_fchownat_LDADD = $(LDADD) @LIBINTL@
-test_fstatat_LDADD = $(LDADD) @LIBINTL@
-test_mkdirat_LDADD = $(LDADD) @LIBINTL@
-test_openat_LDADD = $(LDADD) @LIBINTL@
-test_unlinkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/readlinkat-tests
+++ b/modules/readlinkat-tests
@@ -13,4 +13,3 @@
 Makefile.am:
 TESTS += test-readlinkat
 check_PROGRAMS += test-readlinkat
-test_readlinkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/symlinkat-tests
+++ b/modules/symlinkat-tests
@@ -12,4 +12,3 @@
 Makefile.am:
 TESTS += test-symlinkat
 check_PROGRAMS += test-symlinkat
-test_symlinkat_LDADD = $(LDADD) @LIBINTL@

--- a/modules/utimensat-tests
+++ b/modules/utimensat-tests
@@ -19,4 +19,4 @@
 Makefile.am:
 TESTS += test-utimensat
 check_PROGRAMS += test-utimensat
-test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)

--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -140,9 +140,11 @@
   for (i = 0; i < 32; i++)
     {
       int fd1 = (i & 8) ? dfd : AT_FDCWD;
-      char *file1 = file_name_concat ((i & 4) ? ".." : cwd, BASE "xx", NULL);
+      char *file1 = mfile_name_concat ((i & 4) ? ".." : cwd, BASE "xx", NULL);
       int fd2 = (i & 2) ? dfd : AT_FDCWD;
-      char *file2 = file_name_concat ((i & 1) ? ".." : cwd, BASE "xx", NULL);
+      char *file2 = mfile_name_concat ((i & 1) ? ".." : cwd, BASE "xx", NULL);
+      ASSERT (file1);
+      ASSERT (file2);
       flag = (i & 0x10 ? AT_SYMLINK_FOLLOW : 0);
 
       ASSERT (sprintf (strchr (file1, '\0') - 2, "%02d", i) == 2);