Hi, Jim Meyering wrote: > Currently, every test that uses init.sh must include > tests/init.sh in the "Files:" section and must append EXEEXT and srcdir > definitions to the TESTS_ENVIRONMENT in the "Makefile.am:" section: > > Files: > tests/init.sh > ... > > Makefile.am: > TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)' srcdir='$(srcdir)' > > Does anyone object to making gnulib-tool do those things automatically?
As explained in <http://lists.gnu.org/archive/html/bug-gnulib/2009-12/msg00293.html> I don't think it would be a good idea to put into gnulib-tool things that are specific to a particular coding style or that other people would do differently. Therefore, like tests/macros.h, tests/init.sh should be explicitly listed if a unit test needs. Things are different for EXEEXT and srcdir, though: These are defined by autoconf and automake by default (well, it requires AC_PROG_CC or AC_PROG_CXX, but everyone invokes one or the other). Therefore it's appropriate for gnulib-tool to provide these automatically. Implemented and documented as follows: 2010-01-24 Bruno Haible <br...@clisp.org> Provide EXEEXT and srcdir in TESTS_ENVIRONMENT by default. * gnulib-tool (func_emit_tests_Makefile_am): Add EXEEXT and srcdir assignments to the initial TESTS_ENVIRONMENT. * doc/gnulib.texi (Unit test modules): Document it. * modules/acl-tests (Makefile.am): Drop EXEEXT assignment from TESTS_ENVIRONMENT. * modules/btowc-tests (Makefile.am): Likewise. * modules/c-stack-tests (Makefile.am): Likewise. * modules/c-strcase-tests (Makefile.am): Likewise. * modules/copy-file-tests (Makefile.am): Likewise. * modules/mbmemcasecmp-tests (Makefile.am): Likewise. * modules/mbmemcasecoll-tests (Makefile.am): Likewise. * modules/mbrtowc-tests (Makefile.am): Likewise. * modules/mbscasecmp-tests (Makefile.am): Likewise. * modules/mbscasestr-tests (Makefile.am): Likewise. * modules/mbschr-tests (Makefile.am): Likewise. * modules/mbscspn-tests (Makefile.am): Likewise. * modules/mbsinit-tests (Makefile.am): Likewise. * modules/mbsncasecmp-tests (Makefile.am): Likewise. * modules/mbsnrtowcs-tests (Makefile.am): Likewise. * modules/mbspbrk-tests (Makefile.am): Likewise. * modules/mbspcasecmp-tests (Makefile.am): Likewise. * modules/mbsrchr-tests (Makefile.am): Likewise. * modules/mbsrtowcs-tests (Makefile.am): Likewise. * modules/mbsspn-tests (Makefile.am): Likewise. * modules/mbsstr-tests (Makefile.am): Likewise. * modules/nl_langinfo-tests (Makefile.am): Likewise. * modules/unicase/locale-language-tests (Makefile.am): Likewise. * modules/unistdio/u16-vasnprintf-tests (Makefile.am): Likewise. * modules/unistdio/u32-vasnprintf-tests (Makefile.am): Likewise. * modules/unistdio/u8-vasnprintf-tests (Makefile.am): Likewise. * modules/unistdio/ulc-vasnprintf-tests (Makefile.am): Likewise. * modules/uniwbrk/ulc-wordbreaks-tests (Makefile.am): Likewise. * modules/vasnprintf-posix-tests (Makefile.am): Likewise. * modules/wcrtomb-tests (Makefile.am): Likewise. * modules/wcsnrtombs-tests (Makefile.am): Likewise. * modules/wcsrtombs-tests (Makefile.am): Likewise. * modules/quotearg-tests (Makefile.am): Drop EXEEXT and srcdir assignments from TESTS_ENVIRONMENT. * modules/argp-tests (Makefile.am): Drop TESTS_ENVIRONMENT augmentation. * modules/argp-version-etc-tests (Makefile.am): Likewise. * modules/atexit-tests (Makefile.am): Likewise. * modules/binary-io-tests (Makefile.am): Likewise. * modules/closein-tests (Makefile.am): Likewise. * modules/dprintf-posix-tests (Makefile.am): Likewise. * modules/exclude-tests (Makefile.am): Likewise. * modules/fflush-tests (Makefile.am): Likewise. * modules/fpending-tests (Makefile.am): Likewise. * modules/fprintf-posix-tests (Makefile.am): Likewise. * modules/freadahead-tests (Makefile.am): Likewise. * modules/freadptr-tests (Makefile.am): Likewise. * modules/freadseek-tests (Makefile.am): Likewise. * modules/fseek-tests (Makefile.am): Likewise. * modules/fseeko-tests (Makefile.am): Likewise. * modules/ftell-tests (Makefile.am): Likewise. * modules/ftello-tests (Makefile.am): Likewise. * modules/idpriv-drop-tests (Makefile.am): Likewise. * modules/idpriv-droptemp-tests (Makefile.am): Likewise. * modules/lseek-tests (Makefile.am): Likewise. * modules/parse-duration-tests (Makefile.am): Likewise. * modules/perror-tests (Makefile.am): Likewise. * modules/pipe-filter-gi-tests (Makefile.am): Likewise. * modules/pipe-filter-ii-tests (Makefile.am): Likewise. * modules/pipe-tests (Makefile.am): Likewise. * modules/pread-tests (Makefile.am): Likewise. * modules/printf-posix-tests (Makefile.am): Likewise. * modules/select-tests (Makefile.am): Likewise. * modules/sigpipe-tests (Makefile.am): Likewise. * modules/tsearch-tests (Makefile.am): Likewise. * modules/unicase/ulc-casecmp-tests (Makefile.am): Likewise. * modules/unicase/ulc-casecoll-tests (Makefile.am): Likewise. * modules/uniname/uniname-tests (Makefile.am): Likewise. * modules/uniwidth/width-tests (Makefile.am): Likewise. * modules/vdprintf-posix-tests (Makefile.am): Likewise. * modules/version-etc-tests (Makefile.am): Likewise. * modules/vfprintf-posix-tests (Makefile.am): Likewise. * modules/vprintf-posix-tests (Makefile.am): Likewise. * modules/xalloc-die-tests (Makefile.am): Likewise. * modules/xprintf-posix-tests (Makefile.am): Likewise. * modules/xstrtoimax-tests (Makefile.am): Likewise. * modules/xstrtol-tests (Makefile.am): Likewise. * modules/xstrtoumax-tests (Makefile.am): Likewise. * modules/yesno-tests (Makefile.am): Likewise. Suggested by Jim Meyering. --- doc/gnulib.texi.orig Sun Jan 24 17:26:31 2010 +++ doc/gnulib.texi Sun Jan 24 16:41:06 2010 @@ -559,7 +559,10 @@ Here, the @code{TESTS_ENVIRONMENT} variable can be used to pass values determined by @code{configure} or by the @code{Makefile} to the shell -script, as environment variables. +script, as environment variables. The values of @code{EXEEXT} and of +...@code{srcdir}, from Autoconf and Automake, are already provided as +environment variables, through an initial value of @code{TESTS_ENVIRONMENT} +that @code{gnulib-tool} puts in place. Regardless of the specific form of the unit test, the following guidelines should be respected: --- gnulib-tool.orig Sun Jan 24 17:26:31 2010 +++ gnulib-tool Sun Jan 24 11:39:59 2010 @@ -2373,6 +2373,11 @@ echo "AM_LIBTOOLFLAGS = --preserve-dup-deps" echo fi + # Many test scripts use ${EXEEXT} or ${srcdir}. + # EXEEXT is defined by AC_PROG_CC through autoconf. + # srcdir is defined by autoconf and automake. + echo "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'" + echo cat "$tmp"/allsnippets \ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo "# Clean up after Solaris cc." --- modules/acl-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/acl-tests Sun Jan 24 11:45:24 2010 @@ -19,7 +19,7 @@ Makefile.am: TESTS += test-file-has-acl.sh test-set-mode-acl.sh test-copy-acl.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' USE_ACL=$(USE_ACL) +TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) check_PROGRAMS += test-file-has-acl test-set-mode-acl test-copy-acl test-sameacls test_file_has_acl_LDADD = $(LDADD) $(LIB_ACL) test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ --- modules/argp-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/argp-tests Sun Jan 24 11:41:18 2010 @@ -7,6 +7,5 @@ Makefile.am: TESTS += test-argp test-argp-2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-argp test_argp_LDADD = $(LDADD) @LIBINTL@ --- modules/argp-version-etc-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/argp-version-etc-tests Sun Jan 24 11:44:42 2010 @@ -9,6 +9,5 @@ Makefile.am: TESTS += test-argp-version-etc test-argp-version-etc-1.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-argp-version-etc test_argp_version_etc_LDADD = $(LDADD) @LIBINTL@ --- modules/atexit-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/atexit-tests Sun Jan 24 11:46:42 2010 @@ -10,5 +10,4 @@ Makefile.am: TESTS += test-atexit.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-atexit --- modules/binary-io-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/binary-io-tests Sun Jan 24 11:46:05 2010 @@ -9,6 +9,5 @@ Makefile.am: TESTS += test-binary-io.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-binary-io --- modules/btowc-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/btowc-tests Sun Jan 24 11:42:39 2010 @@ -15,6 +15,6 @@ Makefile.am: TESTS += test-btowc1.sh test-btowc2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-btowc --- modules/c-stack-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/c-stack-tests Sun Jan 24 11:44:38 2010 @@ -11,7 +11,7 @@ Makefile.am: TESTS += test-c-stack.sh test-c-stack2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LIBSIGSEGV='@LIBSIGSEGV@' +TESTS_ENVIRONMENT += LIBSIGSEGV='@LIBSIGSEGV@' check_PROGRAMS += test-c-stack test_c_stack_LDADD = $(LDADD) $(LIBCSTACK) @LIBINTL@ MOSTLYCLEANFILES += t-c-stack.tmp t-c-stack2.tmp --- modules/c-strcase-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/c-strcase-tests Sun Jan 24 11:46:14 2010 @@ -15,5 +15,5 @@ Makefile.am: TESTS += test-c-strcase.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-c-strcasecmp test-c-strncasecmp --- modules/closein-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/closein-tests Sun Jan 24 11:42:35 2010 @@ -9,6 +9,5 @@ Makefile.am: TESTS += test-closein.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-closein test_closein_LDADD = $(LDADD) @LIBINTL@ --- modules/copy-file-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/copy-file-tests Sun Jan 24 11:43:19 2010 @@ -14,6 +14,6 @@ Makefile.am: TESTS += test-copy-file.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' USE_ACL=$(USE_ACL) +TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) check_PROGRAMS += test-copy-file test_copy_file_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ --- modules/dprintf-posix-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/dprintf-posix-tests Sun Jan 24 11:46:49 2010 @@ -15,5 +15,4 @@ Makefile.am: TESTS += test-dprintf-posix.sh test-dprintf-posix2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-dprintf-posix test-dprintf-posix2 --- modules/exclude-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/exclude-tests Sun Jan 24 11:43:44 2010 @@ -23,6 +23,5 @@ test-exclude6.sh\ test-exclude7.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-exclude test_exclude_LDADD = $(LDADD) @LIBINTL@ --- modules/fflush-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/fflush-tests Sun Jan 24 11:42:29 2010 @@ -13,6 +13,5 @@ Makefile.am: TESTS += test-fflush test-fflush2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-fflush test-fflush2 MOSTLYCLEANFILES += test-fflush.txt --- modules/fpending-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/fpending-tests Sun Jan 24 11:46:17 2010 @@ -9,6 +9,5 @@ Makefile.am: TESTS += test-fpending.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-fpending MOSTLYCLEANFILES += test-fpending.t --- modules/fprintf-posix-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/fprintf-posix-tests Sun Jan 24 11:46:24 2010 @@ -18,5 +18,4 @@ Makefile.am: TESTS += test-fprintf-posix.sh test-fprintf-posix2.sh test-fprintf-posix3.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-fprintf-posix test-fprintf-posix2 test-fprintf-posix3 --- modules/freadahead-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/freadahead-tests Sun Jan 24 11:43:34 2010 @@ -11,5 +11,4 @@ Makefile.am: TESTS += test-freadahead.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-freadahead --- modules/freadptr-tests.orig Sun Jan 24 17:26:31 2010 +++ modules/freadptr-tests Sun Jan 24 11:42:09 2010 @@ -13,5 +13,4 @@ Makefile.am: TESTS += test-freadptr.sh test-freadptr2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-freadptr test-freadptr2 --- modules/freadseek-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/freadseek-tests Sun Jan 24 11:45:20 2010 @@ -10,5 +10,4 @@ Makefile.am: TESTS += test-freadseek.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-freadseek --- modules/fseek-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/fseek-tests Sun Jan 24 11:41:29 2010 @@ -13,5 +13,4 @@ Makefile.am: TESTS += test-fseek.sh test-fseek2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-fseek --- modules/fseeko-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/fseeko-tests Sun Jan 24 11:43:48 2010 @@ -13,5 +13,4 @@ Makefile.am: TESTS += test-fseeko.sh test-fseeko2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-fseeko --- modules/ftell-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/ftell-tests Sun Jan 24 11:41:05 2010 @@ -14,5 +14,4 @@ Makefile.am: TESTS += test-ftell.sh test-ftell2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-ftell --- modules/ftello-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/ftello-tests Sun Jan 24 11:44:05 2010 @@ -14,5 +14,4 @@ Makefile.am: TESTS += test-ftello.sh test-ftello2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-ftello --- modules/idpriv-drop-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/idpriv-drop-tests Sun Jan 24 11:41:09 2010 @@ -16,5 +16,4 @@ Makefile.am: TESTS += test-idpriv-drop.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-idpriv-drop --- modules/idpriv-droptemp-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/idpriv-droptemp-tests Sun Jan 24 11:46:45 2010 @@ -16,5 +16,4 @@ Makefile.am: TESTS += test-idpriv-droptemp.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-idpriv-droptemp --- modules/lseek-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/lseek-tests Sun Jan 24 11:41:14 2010 @@ -10,5 +10,4 @@ Makefile.am: TESTS += test-lseek.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-lseek --- modules/mbmemcasecmp-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbmemcasecmp-tests Sun Jan 24 11:41:34 2010 @@ -20,7 +20,6 @@ Makefile.am: TESTS += test-mbmemcasecmp1.sh test-mbmemcasecmp2.sh test-mbmemcasecmp3.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' --- modules/mbmemcasecoll-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbmemcasecoll-tests Sun Jan 24 11:44:21 2010 @@ -20,7 +20,6 @@ Makefile.am: TESTS += test-mbmemcasecoll1.sh test-mbmemcasecoll2.sh test-mbmemcasecoll3.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' --- modules/mbrtowc-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbrtowc-tests Sun Jan 24 11:44:49 2010 @@ -24,7 +24,6 @@ Makefile.am: TESTS += test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_JA='@LOCALE_JA@' \ --- modules/mbscasecmp-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbscasecmp-tests Sun Jan 24 11:46:38 2010 @@ -12,6 +12,6 @@ Makefile.am: TESTS += test-mbscasecmp.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-mbscasecmp --- modules/mbscasestr-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbscasestr-tests Sun Jan 24 11:45:02 2010 @@ -21,6 +21,6 @@ Makefile.am: TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' +TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4 --- modules/mbschr-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbschr-tests Sun Jan 24 11:46:28 2010 @@ -12,6 +12,6 @@ Makefile.am: TESTS += test-mbschr.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' +TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbschr --- modules/mbscspn-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbscspn-tests Sun Jan 24 11:43:08 2010 @@ -12,6 +12,6 @@ Makefile.am: TESTS += test-mbscspn.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-mbscspn --- modules/mbsinit-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbsinit-tests Sun Jan 24 11:43:04 2010 @@ -14,6 +14,6 @@ Makefile.am: TESTS += test-mbsinit.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-mbsinit --- modules/mbsncasecmp-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbsncasecmp-tests Sun Jan 24 11:45:32 2010 @@ -12,6 +12,6 @@ Makefile.am: TESTS += test-mbsncasecmp.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-mbsncasecmp --- modules/mbsnrtowcs-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbsnrtowcs-tests Sun Jan 24 11:43:24 2010 @@ -25,7 +25,6 @@ Makefile.am: TESTS += test-mbsnrtowcs1.sh test-mbsnrtowcs2.sh test-mbsnrtowcs3.sh test-mbsnrtowcs4.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_JA='@LOCALE_JA@' \ --- modules/mbspbrk-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbspbrk-tests Sun Jan 24 11:43:52 2010 @@ -12,6 +12,6 @@ Makefile.am: TESTS += test-mbspbrk.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-mbspbrk --- modules/mbspcasecmp-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbspcasecmp-tests Sun Jan 24 11:43:57 2010 @@ -12,6 +12,6 @@ Makefile.am: TESTS += test-mbspcasecmp.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-mbspcasecmp --- modules/mbsrchr-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbsrchr-tests Sun Jan 24 11:41:53 2010 @@ -12,6 +12,6 @@ Makefile.am: TESTS += test-mbsrchr.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' +TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsrchr --- modules/mbsrtowcs-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbsrtowcs-tests Sun Jan 24 11:43:13 2010 @@ -25,7 +25,6 @@ Makefile.am: TESTS += test-mbsrtowcs1.sh test-mbsrtowcs2.sh test-mbsrtowcs3.sh test-mbsrtowcs4.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_JA='@LOCALE_JA@' \ --- modules/mbsspn-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbsspn-tests Sun Jan 24 11:44:57 2010 @@ -12,6 +12,6 @@ Makefile.am: TESTS += test-mbsspn.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-mbsspn --- modules/mbsstr-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/mbsstr-tests Sun Jan 24 11:46:10 2010 @@ -17,6 +17,6 @@ Makefile.am: TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' +TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3 --- modules/nl_langinfo-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/nl_langinfo-tests Sun Jan 24 11:42:19 2010 @@ -14,5 +14,5 @@ Makefile.am: TESTS += test-nl_langinfo.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-nl_langinfo --- modules/parse-duration-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/parse-duration-tests Sun Jan 24 11:43:37 2010 @@ -10,6 +10,5 @@ Makefile.am: TESTS += test-parse-duration.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-parse-duration test_parse_duration_LDADD = $(LDADD) @LIBINTL@ --- modules/perror-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/perror-tests Sun Jan 24 11:44:02 2010 @@ -9,5 +9,4 @@ Makefile.am: TESTS += test-perror.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-perror --- modules/pipe-filter-gi-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/pipe-filter-gi-tests Sun Jan 24 11:41:24 2010 @@ -19,7 +19,6 @@ Makefile.am: TESTS += test-pipe-filter-gi1.sh test-pipe-filter-gi2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-pipe-filter-gi1 test-pipe-filter-gi2-main test-pipe-filter-gi2-child test_pipe_filter_gi1_LDADD = $(LDADD) @LIBINTL@ test_pipe_filter_gi2_main_LDADD = $(LDADD) @LIBINTL@ --- modules/pipe-filter-ii-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/pipe-filter-ii-tests Sun Jan 24 11:44:33 2010 @@ -18,7 +18,6 @@ Makefile.am: TESTS += test-pipe-filter-ii1.sh test-pipe-filter-ii2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-pipe-filter-ii1 test-pipe-filter-ii2-main test-pipe-filter-ii2-child test_pipe_filter_ii1_LDADD = $(LDADD) @LIBINTL@ test_pipe_filter_ii2_main_LDADD = $(LDADD) @LIBINTL@ --- modules/pipe-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/pipe-tests Sun Jan 24 11:42:44 2010 @@ -10,6 +10,5 @@ Makefile.am: TESTS += test-pipe.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-pipe test_pipe_LDADD = $(LDADD) @LIBINTL@ --- modules/pread-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/pread-tests Sun Jan 24 11:47:47 2010 @@ -12,5 +12,3 @@ Makefile.am: TESTS += test-pread.sh check_PROGRAMS += test-pread -TESTS_ENVIRONMENT += \ - srcdir='$(srcdir)' --- modules/printf-posix-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/printf-posix-tests Sun Jan 24 11:41:39 2010 @@ -16,5 +16,4 @@ Makefile.am: TESTS += test-printf-posix.sh test-printf-posix2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-printf-posix test-printf-posix2 --- modules/quotearg-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/quotearg-tests Sun Jan 24 11:40:57 2010 @@ -20,6 +20,6 @@ Makefile.am: TESTS += test-quotearg.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-quotearg test_quotearg_LDADD = $(LDADD) @LIBINTL@ --- modules/select-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/select-tests Sun Jan 24 11:44:16 2010 @@ -31,7 +31,6 @@ Makefile.am: TESTS += test-select test-select-in.sh test-select-out.sh # test-select-stdin has to be run by hand. -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-select test-select-fd test-select-stdin test_select_LDADD = $(LDADD) @LIBSOCKET@ $(INET_PTON_LIB) test_select_fd_LDADD = $(LDADD) @LIBSOCKET@ --- modules/sigpipe-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/sigpipe-tests Sun Jan 24 11:44:45 2010 @@ -9,6 +9,5 @@ Makefile.am: TESTS += test-sigpipe.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-sigpipe --- modules/tsearch-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/tsearch-tests Sun Jan 24 11:43:31 2010 @@ -20,6 +20,5 @@ Makefile.am: TESTS += test-tsearch.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-tsearch test_tsearch_LDADD = $(LDADD) @TEST_TSEARCH_LIBM@ --- modules/unicase/locale-language-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/unicase/locale-language-tests Sun Jan 24 11:47:01 2010 @@ -19,7 +19,7 @@ Makefile.am: TESTS += unicase/test-locale-language.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-locale-language test_locale_language_SOURCES = unicase/test-locale-language.c test_locale_language_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ --- modules/unicase/ulc-casecmp-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/unicase/ulc-casecmp-tests Sun Jan 24 11:42:25 2010 @@ -17,7 +17,6 @@ Makefile.am: TESTS += unicase/test-ulc-casecmp1.sh unicase/test-ulc-casecmp2.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-ulc-casecmp --- modules/unicase/ulc-casecoll-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/unicase/ulc-casecoll-tests Sun Jan 24 11:47:05 2010 @@ -17,7 +17,6 @@ Makefile.am: TESTS += unicase/test-ulc-casecoll1.sh unicase/test-ulc-casecoll2.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-ulc-casecoll --- modules/uniname/uniname-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/uniname/uniname-tests Sun Jan 24 11:45:40 2010 @@ -11,7 +11,6 @@ Makefile.am: TESTS += uniname/test-uninames.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-uninames test_uninames_SOURCES = uniname/test-uninames.c test_uninames_LDADD = $(LDADD) @LIBINTL@ --- modules/unistdio/u16-vasnprintf-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/unistdio/u16-vasnprintf-tests Sun Jan 24 11:45:56 2010 @@ -22,7 +22,7 @@ Makefile.am: TESTS += test-u16-vasnprintf1 unistdio/test-u16-vasnprintf2.sh unistdio/test-u16-vasnprintf3.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-u16-vasnprintf1 test-u16-vasnprintf2 test-u16-vasnprintf3 test_u16_vasnprintf1_SOURCES = unistdio/test-u16-vasnprintf1.c test_u16_vasnprintf1_LDADD = $(LDADD) @LIBICONV@ --- modules/unistdio/u32-vasnprintf-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/unistdio/u32-vasnprintf-tests Sun Jan 24 11:45:45 2010 @@ -22,7 +22,7 @@ Makefile.am: TESTS += test-u32-vasnprintf1 unistdio/test-u32-vasnprintf2.sh unistdio/test-u32-vasnprintf3.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-u32-vasnprintf1 test-u32-vasnprintf2 test-u32-vasnprintf3 test_u32_vasnprintf1_SOURCES = unistdio/test-u32-vasnprintf1.c test_u32_vasnprintf1_LDADD = $(LDADD) @LIBICONV@ --- modules/unistdio/u8-vasnprintf-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/unistdio/u8-vasnprintf-tests Sun Jan 24 11:45:51 2010 @@ -22,7 +22,7 @@ Makefile.am: TESTS += test-u8-vasnprintf1 unistdio/test-u8-vasnprintf2.sh unistdio/test-u8-vasnprintf3.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-u8-vasnprintf1 test-u8-vasnprintf2 test-u8-vasnprintf3 test_u8_vasnprintf1_SOURCES = unistdio/test-u8-vasnprintf1.c test_u8_vasnprintf1_LDADD = $(LDADD) @LIBICONV@ --- modules/unistdio/ulc-vasnprintf-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/unistdio/ulc-vasnprintf-tests Sun Jan 24 11:46:02 2010 @@ -18,7 +18,7 @@ Makefile.am: TESTS += test-ulc-vasnprintf1 unistdio/test-ulc-vasnprintf2.sh unistdio/test-ulc-vasnprintf3.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-ulc-vasnprintf1 test-ulc-vasnprintf2 test-ulc-vasnprintf3 test_ulc_vasnprintf1_SOURCES = unistdio/test-ulc-vasnprintf1.c test_ulc_vasnprintf1_LDADD = $(LDADD) @LIBICONV@ --- modules/uniwbrk/ulc-wordbreaks-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/uniwbrk/ulc-wordbreaks-tests Sun Jan 24 11:45:09 2010 @@ -12,7 +12,7 @@ Makefile.am: TESTS += uniwbrk/test-ulc-wordbreaks.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' check_PROGRAMS += test-ulc-wordbreaks test_ulc_wordbreaks_SOURCES = uniwbrk/test-ulc-wordbreaks.c test_ulc_wordbreaks_LDADD = $(LDADD) @LIBICONV@ --- modules/uniwidth/width-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/uniwidth/width-tests Sun Jan 24 11:45:27 2010 @@ -10,7 +10,6 @@ Makefile.am: TESTS += test-uc_width uniwidth/test-uc_width2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-uc_width test-uc_width2 test_uc_width_SOURCES = uniwidth/test-uc_width.c test_uc_width2_SOURCES = uniwidth/test-uc_width2.c --- modules/vasnprintf-posix-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/vasnprintf-posix-tests Sun Jan 24 11:41:47 2010 @@ -17,5 +17,5 @@ Makefile.am: TESTS += test-vasnprintf-posix test-vasnprintf-posix2.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-vasnprintf-posix test-vasnprintf-posix2 --- modules/vdprintf-posix-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/vdprintf-posix-tests Sun Jan 24 11:47:40 2010 @@ -13,5 +13,4 @@ Makefile.am: TESTS += test-vdprintf-posix.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-vdprintf-posix --- modules/version-etc-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/version-etc-tests Sun Jan 24 11:46:19 2010 @@ -8,6 +8,5 @@ Makefile.am: TESTS += test-version-etc.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-version-etc test_version_etc_LDADD = $(LDADD) @LIBINTL@ --- modules/vfprintf-posix-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/vfprintf-posix-tests Sun Jan 24 11:46:33 2010 @@ -13,5 +13,4 @@ Makefile.am: TESTS += test-vfprintf-posix.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-vfprintf-posix --- modules/vprintf-posix-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/vprintf-posix-tests Sun Jan 24 11:44:24 2010 @@ -13,5 +13,4 @@ Makefile.am: TESTS += test-vprintf-posix.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-vprintf-posix --- modules/wcrtomb-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/wcrtomb-tests Sun Jan 24 11:44:52 2010 @@ -20,7 +20,6 @@ Makefile.am: TESTS += test-wcrtomb.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_JA='@LOCALE_JA@' \ --- modules/wcsnrtombs-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/wcsnrtombs-tests Sun Jan 24 11:43:40 2010 @@ -22,7 +22,6 @@ Makefile.am: TESTS += test-wcsnrtombs1.sh test-wcsnrtombs2.sh test-wcsnrtombs3.sh test-wcsnrtombs4.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_JA='@LOCALE_JA@' \ --- modules/wcsrtombs-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/wcsrtombs-tests Sun Jan 24 11:45:14 2010 @@ -22,7 +22,6 @@ Makefile.am: TESTS += test-wcsrtombs1.sh test-wcsrtombs2.sh test-wcsrtombs3.sh test-wcsrtombs4.sh TESTS_ENVIRONMENT += \ - EXEEXT='@EXEEXT@' \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ LOCALE_JA='@LOCALE_JA@' \ --- modules/xalloc-die-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/xalloc-die-tests Sun Jan 24 11:44:30 2010 @@ -8,6 +8,5 @@ Makefile.am: TESTS += test-xalloc-die.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-xalloc-die test_xalloc_die_LDADD = $(LDADD) @LIBINTL@ --- modules/xprintf-posix-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/xprintf-posix-tests Sun Jan 24 11:43:28 2010 @@ -15,7 +15,6 @@ Makefile.am: TESTS += test-xprintf-posix.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' check_PROGRAMS += test-xfprintf-posix test-xprintf-posix test_xfprintf_posix_LDADD = $(LDADD) @LIBINTL@ test_xprintf_posix_LDADD = $(LDADD) @LIBINTL@ --- modules/xstrtoimax-tests.orig Sun Jan 24 17:26:32 2010 +++ modules/xstrtoimax-tests Sun Jan 24 11:44:27 2010 @@ -8,6 +8,5 @@ Makefile.am: TESTS += test-xstrtoimax.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-xstrtoimax test_xstrtoimax_LDADD = $(LDADD) @LIBINTL@ --- modules/xstrtol-tests.orig Sun Jan 24 17:26:33 2010 +++ modules/xstrtol-tests Sun Jan 24 11:45:35 2010 @@ -9,7 +9,6 @@ Makefile.am: TESTS += test-xstrtol.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-xstrtol test-xstrtoul test_xstrtol_LDADD = $(LDADD) @LIBINTL@ test_xstrtoul_LDADD = $(LDADD) @LIBINTL@ --- modules/xstrtoumax-tests.orig Sun Jan 24 17:26:33 2010 +++ modules/xstrtoumax-tests Sun Jan 24 11:42:14 2010 @@ -8,6 +8,5 @@ Makefile.am: TESTS += test-xstrtoumax.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-xstrtoumax test_xstrtoumax_LDADD = $(LDADD) @LIBINTL@ --- modules/yesno-tests.orig Sun Jan 24 17:26:33 2010 +++ modules/yesno-tests Sun Jan 24 11:42:49 2010 @@ -10,6 +10,5 @@ Makefile.am: TESTS += test-yesno.sh -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' check_PROGRAMS += test-yesno test_yesno_LDADD = $(LDADD) @LIBINTL@