[PATCHv2 4/4] tests: drop unused link dependency

[Eric Blake]

Ever since commit 2392b18099, openat and fdopendir no longer drag in
xalloc-die through indirect dependencies, so these tests no longer
need $(LIBINTL).

* 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.

Signed-off-by: Eric Blake <address@hidden>
---

change in v2: break last xalloc use in test-linkat

After this, ./gnulib-tool --with-tests --test for all the affected
modules confirms that xalloc-die is no longer pulled in.

 ChangeLog                  |   16 ++++++++++++++++
 modules/areadlinkat-tests  |    1 -
 modules/dirent-safer-tests |    3 ---
 modules/fdopendir-tests    |    1 -
 modules/fdutimensat-tests  |    2 +-
 modules/linkat-tests       |    3 +--
 modules/mkfifoat-tests     |    1 -
 modules/openat-safer-tests |    1 -
 modules/openat-tests       |    5 -----
 modules/readlinkat-tests   |    1 -
 modules/symlinkat-tests    |    1 -
 modules/utimensat-tests    |    2 +-
 tests/test-linkat.c        |    6 ++++--
 13 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 134daa8..cd32fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2011-04-27  Eric Blake  <address@hidden>

+       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.
diff --git a/modules/areadlinkat-tests b/modules/areadlinkat-tests
index 422ac61..23e5278 100644
--- a/modules/areadlinkat-tests
+++ b/modules/areadlinkat-tests
@@ -13,4 +13,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-areadlinkat
 check_PROGRAMS += test-areadlinkat
-test_areadlinkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/dirent-safer-tests b/modules/dirent-safer-tests
index 172c662..2bc9593 100644
--- a/modules/dirent-safer-tests
+++ b/modules/dirent-safer-tests
@@ -10,6 +10,3 @@ configure.ac:
 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)
diff --git a/modules/fdopendir-tests b/modules/fdopendir-tests
index bee2df7..39575ba 100644
--- a/modules/fdopendir-tests
+++ b/modules/fdopendir-tests
@@ -12,4 +12,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-fdopendir
 check_PROGRAMS += test-fdopendir
-test_fdopendir_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests
index 48ea78d..1d107ce 100644
--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -19,4 +19,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-fdutimensat
 check_PROGRAMS += test-fdutimensat
-test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
diff --git a/modules/linkat-tests b/modules/linkat-tests
index c49c1b3..3f2d3f0 100644
--- a/modules/linkat-tests
+++ b/modules/linkat-tests
@@ -7,7 +7,7 @@ tests/macros.h
 Depends-on:
 ignore-value
 areadlink-with-size
-filenamecat
+filenamecat-lgpl
 getcwd-lgpl
 progname
 same-inode
@@ -17,4 +17,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-linkat
 check_PROGRAMS += test-linkat
-test_linkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/mkfifoat-tests b/modules/mkfifoat-tests
index 8be33df..a1e33c9 100644
--- a/modules/mkfifoat-tests
+++ b/modules/mkfifoat-tests
@@ -13,4 +13,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-mkfifoat
 check_PROGRAMS += test-mkfifoat
-test_mkfifoat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/openat-safer-tests b/modules/openat-safer-tests
index 1f0b158..a33d2c6 100644
--- a/modules/openat-safer-tests
+++ b/modules/openat-safer-tests
@@ -9,4 +9,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-openat-safer
 check_PROGRAMS += test-openat-safer
-test_openat_safer_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/openat-tests b/modules/openat-tests
index 250a574..959d882 100644
--- a/modules/openat-tests
+++ b/modules/openat-tests
@@ -31,8 +31,3 @@ Makefile.am:
 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@
diff --git a/modules/readlinkat-tests b/modules/readlinkat-tests
index de23df8..96faa56 100644
--- a/modules/readlinkat-tests
+++ b/modules/readlinkat-tests
@@ -13,4 +13,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-readlinkat
 check_PROGRAMS += test-readlinkat
-test_readlinkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/symlinkat-tests b/modules/symlinkat-tests
index 9033149..13ae9bd 100644
--- a/modules/symlinkat-tests
+++ b/modules/symlinkat-tests
@@ -12,4 +12,3 @@ configure.ac:
 Makefile.am:
 TESTS += test-symlinkat
 check_PROGRAMS += test-symlinkat
-test_symlinkat_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/utimensat-tests b/modules/utimensat-tests
index 26dbac6..987a86a 100644
--- a/modules/utimensat-tests
+++ b/modules/utimensat-tests
@@ -19,4 +19,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-utimensat
 check_PROGRAMS += test-utimensat
-test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
diff --git a/tests/test-linkat.c b/tests/test-linkat.c
index e3c8a5e..2bf1790 100644
--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -140,9 +140,11 @@ main (void)
   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);
-- 
1.7.4.4