From: Eric Blake Date: Wed, 27 Apr 2011 22:38:05 +0000 (-0600) Subject: tests: drop unused link dependency X-Git-Tag: v0.1~2880 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=d6d01fdde58da00d0d839711097e3acb83f61754;p=gnulib.git tests: drop unused link dependency 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 --- diff --git a/ChangeLog b/ChangeLog index df91f2583..654d5c059 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 2011-04-28 Eric Blake + 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 422ac6141..23e527848 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 172c662de..2bc95933f 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 bee2df7df..39575ba3f 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 48ea78d23..1d107ce5c 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 c49c1b324..3f2d3f090 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 8be33df05..a1e33c981 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 1f0b158fc..a33d2c6b6 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 250a57459..959d88233 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 de23df8dd..96faa5699 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 90331494a..13ae9bd8a 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 26dbac676..987a86abc 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 e3c8a5e1d..2bf179052 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);