[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] prefer AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT
|
From: |
Mathieu Lirzin |
|
Subject: |
[PATCH 1/2] prefer AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT |
|
Date: |
Sat, 21 May 2016 14:48:09 +0200 |
* Makefile, doc/gnulib.texi, doc/valgrind-tests.texi:
* gnulib-tool, modules/acl-tests, modules/btowc-tests:
* modules/c-snprintf-tests, modules/c-stack-tests:
* modules/c-strcase-tests, modules/c-vasprintf-tests:
* modules/c-vsnprintf-tests, modules/c-xvasprintf-tests:
* modules/copy-file-tests, modules/file-has-acl-tests:
* modules/localcharset, modules/mbmemcasecmp-tests:
* modules/mbmemcasecoll-tests, modules/mbrtowc-tests:
* modules/mbscasecmp-tests, modules/mbscasestr-tests:
* modules/mbschr-tests, modules/mbscspn-tests:
* modules/mbsinit-tests, modules/mbsncasecmp-tests:
* modules/mbsnrtowcs-tests, modules/mbspbrk-tests:
* modules/mbspcasecmp-tests, modules/mbsrchr-tests:
* modules/mbsrtowcs-tests, modules/mbsspn-tests, modules/mbsstr-tests:
* modules/nl_langinfo-tests, modules/quotearg-tests:
* modules/setlocale-tests, modules/unicase/locale-language-tests:
* modules/unicase/ulc-casecmp-tests
* modules/unicase/ulc-casecoll-tests:
* modules/unigbrk/ulc-grapheme-breaks-tests:
* modules/unistdio/u16-vasnprintf-tests:
* modules/unistdio/u32-vasnprintf-tests:
* modules/unistdio/u8-vasnprintf-tests:
* modules/unistdio/ulc-vasnprintf-tests:
* modules/uniwbrk/ulc-wordbreaks-tests, modules/update-copyright-tests:
* modules/vasnprintf-posix-tests, modules/vc-list-files-tests:
* modules/verify-tests, modules/wcrtomb-tests
* modules/wcsnrtombs-tests, modules/wcsrtombs-tests:
* tests/havelib/Makefile.am, tests/init.sh: Prefer
AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT since the latter is
reserved for the user.
---
ChangeLog | 34 +++++++++++++++++++++++++++++++
Makefile | 6 +++---
doc/gnulib.texi | 6 +++---
doc/valgrind-tests.texi | 6 +++---
gnulib-tool | 4 ++--
modules/acl-tests | 2 +-
modules/btowc-tests | 2 +-
modules/c-snprintf-tests | 2 +-
modules/c-stack-tests | 2 +-
modules/c-strcase-tests | 2 +-
modules/c-vasprintf-tests | 2 +-
modules/c-vsnprintf-tests | 2 +-
modules/c-xvasprintf-tests | 2 +-
modules/copy-file-tests | 2 +-
modules/file-has-acl-tests | 2 +-
modules/localcharset | 2 +-
modules/mbmemcasecmp-tests | 2 +-
modules/mbmemcasecoll-tests | 2 +-
modules/mbrtowc-tests | 2 +-
modules/mbscasecmp-tests | 2 +-
modules/mbscasestr-tests | 2 +-
modules/mbschr-tests | 2 +-
modules/mbscspn-tests | 2 +-
modules/mbsinit-tests | 2 +-
modules/mbsncasecmp-tests | 2 +-
modules/mbsnrtowcs-tests | 2 +-
modules/mbspbrk-tests | 2 +-
modules/mbspcasecmp-tests | 2 +-
modules/mbsrchr-tests | 2 +-
modules/mbsrtowcs-tests | 2 +-
modules/mbsspn-tests | 2 +-
modules/mbsstr-tests | 2 +-
modules/nl_langinfo-tests | 2 +-
modules/quotearg-tests | 2 +-
modules/setlocale-tests | 2 +-
modules/unicase/locale-language-tests | 2 +-
modules/unicase/ulc-casecmp-tests | 2 +-
modules/unicase/ulc-casecoll-tests | 2 +-
modules/unigbrk/ulc-grapheme-breaks-tests | 2 +-
modules/unistdio/u16-vasnprintf-tests | 2 +-
modules/unistdio/u32-vasnprintf-tests | 2 +-
modules/unistdio/u8-vasnprintf-tests | 2 +-
modules/unistdio/ulc-vasnprintf-tests | 2 +-
modules/uniwbrk/ulc-wordbreaks-tests | 2 +-
modules/update-copyright-tests | 2 +-
modules/vasnprintf-posix-tests | 2 +-
modules/vc-list-files-tests | 2 +-
modules/verify-tests | 2 +-
modules/wcrtomb-tests | 2 +-
modules/wcsnrtombs-tests | 2 +-
modules/wcsrtombs-tests | 2 +-
tests/havelib/Makefile.am | 15 +++++++-------
tests/init.sh | 6 +++---
53 files changed, 101 insertions(+), 68 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f4bc50f..e324133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2016-05-21 Mathieu Lirzin <address@hidden>
+
+ prefer AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT
+ * Makefile, doc/gnulib.texi, doc/valgrind-tests.texi:
+ * gnulib-tool, modules/acl-tests, modules/btowc-tests:
+ * modules/c-snprintf-tests, modules/c-stack-tests:
+ * modules/c-strcase-tests, modules/c-vasprintf-tests:
+ * modules/c-vsnprintf-tests, modules/c-xvasprintf-tests:
+ * modules/copy-file-tests, modules/file-has-acl-tests:
+ * modules/localcharset, modules/mbmemcasecmp-tests:
+ * modules/mbmemcasecoll-tests, modules/mbrtowc-tests:
+ * modules/mbscasecmp-tests, modules/mbscasestr-tests:
+ * modules/mbschr-tests, modules/mbscspn-tests:
+ * modules/mbsinit-tests, modules/mbsncasecmp-tests:
+ * modules/mbsnrtowcs-tests, modules/mbspbrk-tests:
+ * modules/mbspcasecmp-tests, modules/mbsrchr-tests:
+ * modules/mbsrtowcs-tests, modules/mbsspn-tests, modules/mbsstr-tests:
+ * modules/nl_langinfo-tests, modules/quotearg-tests:
+ * modules/setlocale-tests, modules/unicase/locale-language-tests:
+ * modules/unicase/ulc-casecmp-tests
+ * modules/unicase/ulc-casecoll-tests:
+ * modules/unigbrk/ulc-grapheme-breaks-tests:
+ * modules/unistdio/u16-vasnprintf-tests:
+ * modules/unistdio/u32-vasnprintf-tests:
+ * modules/unistdio/u8-vasnprintf-tests:
+ * modules/unistdio/ulc-vasnprintf-tests:
+ * modules/uniwbrk/ulc-wordbreaks-tests, modules/update-copyright-tests:
+ * modules/vasnprintf-posix-tests, modules/vc-list-files-tests:
+ * modules/verify-tests, modules/wcrtomb-tests
+ * modules/wcsnrtombs-tests, modules/wcsrtombs-tests:
+ * tests/havelib/Makefile.am, tests/init.sh: Prefer
+ AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT since the latter is
+ reserved for the user.
+
2016-05-20 Ludovic Courtès <address@hidden>
gendocs.sh: Set default TOP_NODE_UP_URL in HTML output.
diff --git a/Makefile b/Makefile
index a89980b..3de3404 100644
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,11 @@ sc_prohibit_leading_TABs:
1>&2; exit 1; } || : \
else :; fi
-sc_prohibit_augmenting_PATH_via_TESTS_ENVIRONMENT:
+sc_prohibit_augmenting_PATH_via_AM_TESTS_ENVIRONMENT:
@if test -d .git; then \
url=http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/22874; \
- git grep '^[ ]*TESTS_ENVIRONMENT += PATH=' modules \
- && { printf '%s\n' 'Do not augment PATH via TESTS_ENVIRONMENT;' \
+ git grep '^[ ]*AM_TESTS_ENVIRONMENT += PATH=' modules \
+ && { printf '%s\n' 'Do not augment PATH via AM_TESTS_ENVIRONMENT;' \
" see <$$url>" 1>&2; exit 1; } || : \
else :; fi
diff --git a/doc/gnulib.texi b/doc/gnulib.texi
index 375e05b..9a1f275 100644
--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -583,15 +583,15 @@ configure.ac:
Makefile.am:
TESTS += test-foo.sh
-TESTS_ENVIRONMENT += FOO_BAR='@@FOO_BAR@@'
+AM_TESTS_ENVIRONMENT += FOO_BAR='@@FOO_BAR@@'
check_PROGRAMS += test-foo
@end smallexample
-Here, the @code{TESTS_ENVIRONMENT} variable can be used to pass values
+Here, the @code{AM_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. 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}
+environment variables, through an initial value of @code{AM_TESTS_ENVIRONMENT}
that @code{gnulib-tool} puts in place.
Regardless of the specific form of the unit test, the following guidelines
diff --git a/doc/valgrind-tests.texi b/doc/valgrind-tests.texi
index ec37202..3bff813 100644
--- a/doc/valgrind-tests.texi
+++ b/doc/valgrind-tests.texi
@@ -5,14 +5,14 @@ For projects written in C or similar languages, running the
self-tests
under Valgrind can reveal hard to find memory issues. The
@code{valgrind-tests} module searches for Valgrind and declares the
@code{VALGRIND} automake variable for use with automake's
address@hidden
address@hidden
After importing the @code{valgrind-tests} module to your project, you
use it by adding the following to the @code{Makefile.am} that runs the
self-tests:
@smallexample
-TESTS_ENVIRONMENT = $(VALGRIND)
+AM_TESTS_ENVIRONMENT = $(VALGRIND)
@end smallexample
This will run all self-checks under valgrind. This can be wasteful if
@@ -31,7 +31,7 @@ However, this means that binaries invoked through scripts
will not be
invoked under valgrind, which could be solved by adding the following:
@smallexample
-TESTS_ENVIRONMENT = VALGRIND='$(VALGRIND)'
+AM_TESTS_ENVIRONMENT = VALGRIND='$(VALGRIND)'
@end smallexample
And then modify the shell scripts to invoke the binary prefixed with
diff --git a/gnulib-tool b/gnulib-tool
index 45d5fe0..64d1423 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3821,7 +3821,7 @@ func_emit_tests_Makefile_am ()
echo "SUBDIRS = ."
echo "TESTS ="
echo "XFAIL_TESTS ="
- echo "TESTS_ENVIRONMENT ="
+ echo "AM_TESTS_ENVIRONMENT ="
echo "noinst_PROGRAMS ="
if ! $for_test; then
echo "check_PROGRAMS ="
@@ -3911,7 +3911,7 @@ func_emit_tests_Makefile_am ()
# 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 "AM_TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'"
echo
cat "$tmp"/main_snippets "$tmp"/longrunning_snippets \
| sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
diff --git a/modules/acl-tests b/modules/acl-tests
index e755014..b4e5dc5 100644
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -23,7 +23,7 @@ Makefile.am:
TESTS += \
test-set-mode-acl.sh test-set-mode-acl-1.sh test-set-mode-acl-2.sh \
test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh
-TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
+AM_TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls
test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
diff --git a/modules/btowc-tests b/modules/btowc-tests
index 66196b1..79e504d 100644
--- a/modules/btowc-tests
+++ b/modules/btowc-tests
@@ -16,6 +16,6 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-btowc1.sh test-btowc2.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-btowc
diff --git a/modules/c-snprintf-tests b/modules/c-snprintf-tests
index 86d6a14..56de582 100644
--- a/modules/c-snprintf-tests
+++ b/modules/c-snprintf-tests
@@ -14,4 +14,4 @@ gt_LOCALE_FR
Makefile.am:
TESTS += test-c-snprintf.sh
check_PROGRAMS += test-c-snprintf
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
diff --git a/modules/c-stack-tests b/modules/c-stack-tests
index 8174862..9d12ed4 100644
--- a/modules/c-stack-tests
+++ b/modules/c-stack-tests
@@ -11,7 +11,7 @@ configure.ac:
Makefile.am:
TESTS += test-c-stack.sh test-c-stack2.sh
-TESTS_ENVIRONMENT += LIBSIGSEGV='@LIBSIGSEGV@'
+AM_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
diff --git a/modules/c-strcase-tests b/modules/c-strcase-tests
index 81d4220..d04e408 100644
--- a/modules/c-strcase-tests
+++ b/modules/c-strcase-tests
@@ -16,5 +16,5 @@ gt_LOCALE_TR_UTF8
Makefile.am:
TESTS += test-c-strcase.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-c-strcasecmp test-c-strncasecmp
diff --git a/modules/c-vasprintf-tests b/modules/c-vasprintf-tests
index 9409563..62a5924 100644
--- a/modules/c-vasprintf-tests
+++ b/modules/c-vasprintf-tests
@@ -14,4 +14,4 @@ gt_LOCALE_FR
Makefile.am:
TESTS += test-c-vasprintf.sh
check_PROGRAMS += test-c-vasprintf
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
diff --git a/modules/c-vsnprintf-tests b/modules/c-vsnprintf-tests
index 6a76092..69d3098 100644
--- a/modules/c-vsnprintf-tests
+++ b/modules/c-vsnprintf-tests
@@ -14,4 +14,4 @@ gt_LOCALE_FR
Makefile.am:
TESTS += test-c-vsnprintf.sh
check_PROGRAMS += test-c-vsnprintf
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
diff --git a/modules/c-xvasprintf-tests b/modules/c-xvasprintf-tests
index a118de0..3d6900d 100644
--- a/modules/c-xvasprintf-tests
+++ b/modules/c-xvasprintf-tests
@@ -16,4 +16,4 @@ Makefile.am:
TESTS += test-c-xvasprintf.sh
check_PROGRAMS += test-c-xvasprintf
test_c_xvasprintf_LDADD = $(LDADD) @LIBINTL@
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
diff --git a/modules/copy-file-tests b/modules/copy-file-tests
index cc06a0b..5dd59ab 100644
--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -16,6 +16,6 @@ configure.ac:
Makefile.am:
TESTS += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh
-TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
+AM_TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
check_PROGRAMS += test-copy-file
test_copy_file_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
diff --git a/modules/file-has-acl-tests b/modules/file-has-acl-tests
index 5a26020..e3a1c6b 100644
--- a/modules/file-has-acl-tests
+++ b/modules/file-has-acl-tests
@@ -14,6 +14,6 @@ AC_CHECK_DECLS_ONCE([alarm])
Makefile.am:
TESTS += \
test-file-has-acl.sh test-file-has-acl-1.sh test-file-has-acl-2.sh
-TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
+AM_TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
check_PROGRAMS += test-file-has-acl
test_file_has_acl_LDADD = $(LDADD) $(LIB_HAS_ACL)
diff --git a/modules/localcharset b/modules/localcharset
index 1c2dd19..b092aff 100644
--- a/modules/localcharset
+++ b/modules/localcharset
@@ -5,7 +5,7 @@ Notice:
If your package's tests make use of the locale_charset() function directly or
indirectly, you may need to define the CHARSETALIASDIR environment variable,
so that "make check" works before "make install". In Makefile.am syntax:
-TESTS_ENVIRONMENT += @LOCALCHARSET_TESTS_ENVIRONMENT@
+AM_TESTS_ENVIRONMENT += @LOCALCHARSET_TESTS_ENVIRONMENT@
Files:
lib/localcharset.h
diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests
index e863f6d..ad9c0cd 100644
--- a/modules/mbmemcasecmp-tests
+++ b/modules/mbmemcasecmp-tests
@@ -20,7 +20,7 @@ gt_LOCALE_TR_UTF8
Makefile.am:
TESTS += test-mbmemcasecmp1.sh test-mbmemcasecmp2.sh test-mbmemcasecmp3.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests
index 8c834d7..1b53fd2 100644
--- a/modules/mbmemcasecoll-tests
+++ b/modules/mbmemcasecoll-tests
@@ -20,7 +20,7 @@ gt_LOCALE_TR_UTF8
Makefile.am:
TESTS += test-mbmemcasecoll1.sh test-mbmemcasecoll2.sh test-mbmemcasecoll3.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests
index fe948c3..220e84f 100644
--- a/modules/mbrtowc-tests
+++ b/modules/mbrtowc-tests
@@ -35,7 +35,7 @@ TESTS += \
test-mbrtowc5.sh \
test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_JA='@LOCALE_JA@' \
diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests
index 460e998..a7b4d8f 100644
--- a/modules/mbscasecmp-tests
+++ b/modules/mbscasecmp-tests
@@ -13,6 +13,6 @@ gt_LOCALE_TR_UTF8
Makefile.am:
TESTS += test-mbscasecmp.sh
-TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbscasecmp
diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests
index 15d5c97..d82c5d3 100644
--- a/modules/mbscasestr-tests
+++ b/modules/mbscasestr-tests
@@ -22,6 +22,6 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh
test-mbscasestr4.sh
-TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+AM_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
diff --git a/modules/mbschr-tests b/modules/mbschr-tests
index 773eb00..e28ec60 100644
--- a/modules/mbschr-tests
+++ b/modules/mbschr-tests
@@ -13,6 +13,6 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-mbschr.sh
-TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+AM_TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbschr
diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests
index 3052a3b..5d09795 100644
--- a/modules/mbscspn-tests
+++ b/modules/mbscspn-tests
@@ -13,6 +13,6 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-mbscspn.sh
-TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbscspn
diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests
index 5225c36..901c21b 100644
--- a/modules/mbsinit-tests
+++ b/modules/mbsinit-tests
@@ -15,6 +15,6 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-mbsinit.sh
-TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbsinit
diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests
index 1844904..5194c39 100644
--- a/modules/mbsncasecmp-tests
+++ b/modules/mbsncasecmp-tests
@@ -13,6 +13,6 @@ gt_LOCALE_TR_UTF8
Makefile.am:
TESTS += test-mbsncasecmp.sh
-TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbsncasecmp
diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests
index 1a53405..fa1e85e 100644
--- a/modules/mbsnrtowcs-tests
+++ b/modules/mbsnrtowcs-tests
@@ -25,7 +25,7 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-mbsnrtowcs1.sh test-mbsnrtowcs2.sh test-mbsnrtowcs3.sh
test-mbsnrtowcs4.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_JA='@LOCALE_JA@' \
diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests
index 77a305a..fd9060e 100644
--- a/modules/mbspbrk-tests
+++ b/modules/mbspbrk-tests
@@ -13,6 +13,6 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-mbspbrk.sh
-TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbspbrk
diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests
index 5f38e22..9bc68b7 100644
--- a/modules/mbspcasecmp-tests
+++ b/modules/mbspcasecmp-tests
@@ -13,6 +13,6 @@ gt_LOCALE_TR_UTF8
Makefile.am:
TESTS += test-mbspcasecmp.sh
-TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbspcasecmp
diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests
index d848037..cc79df6 100644
--- a/modules/mbsrchr-tests
+++ b/modules/mbsrchr-tests
@@ -13,6 +13,6 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-mbsrchr.sh
-TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+AM_TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrchr
diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests
index 74dcd63..5ff6947 100644
--- a/modules/mbsrtowcs-tests
+++ b/modules/mbsrtowcs-tests
@@ -25,7 +25,7 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-mbsrtowcs1.sh test-mbsrtowcs2.sh test-mbsrtowcs3.sh
test-mbsrtowcs4.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_JA='@LOCALE_JA@' \
diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests
index ed7e47a..fb96db4 100644
--- a/modules/mbsspn-tests
+++ b/modules/mbsspn-tests
@@ -13,6 +13,6 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-mbsspn.sh
-TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbsspn
diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests
index 01e605d..e2b56ff 100644
--- a/modules/mbsstr-tests
+++ b/modules/mbsstr-tests
@@ -18,6 +18,6 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh
-TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3
diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests
index 2d3fda0..fa176f2 100644
--- a/modules/nl_langinfo-tests
+++ b/modules/nl_langinfo-tests
@@ -15,5 +15,5 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-nl_langinfo.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-nl_langinfo
diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index 1af4eff..a49f820 100644
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -26,6 +26,6 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-quotearg.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-quotearg
test_quotearg_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/setlocale-tests b/modules/setlocale-tests
index 8c35c9d..231e013 100644
--- a/modules/setlocale-tests
+++ b/modules/setlocale-tests
@@ -21,7 +21,7 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-setlocale1.sh test-setlocale2.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_JA='@LOCALE_JA@' \
diff --git a/modules/unicase/locale-language-tests
b/modules/unicase/locale-language-tests
index 87f3eaf..916b993 100644
--- a/modules/unicase/locale-language-tests
+++ b/modules/unicase/locale-language-tests
@@ -20,7 +20,7 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += unicase/test-locale-language.sh
-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@'
+AM_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) $(LIBUNISTRING) @INTL_MACOSX_LIBS@
diff --git a/modules/unicase/ulc-casecmp-tests
b/modules/unicase/ulc-casecmp-tests
index 0d78fbe..7462640 100644
--- a/modules/unicase/ulc-casecmp-tests
+++ b/modules/unicase/ulc-casecmp-tests
@@ -17,7 +17,7 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += unicase/test-ulc-casecmp1.sh unicase/test-ulc-casecmp2.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-ulc-casecmp
diff --git a/modules/unicase/ulc-casecoll-tests
b/modules/unicase/ulc-casecoll-tests
index bd2e59b..b66e73f 100644
--- a/modules/unicase/ulc-casecoll-tests
+++ b/modules/unicase/ulc-casecoll-tests
@@ -17,7 +17,7 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += unicase/test-ulc-casecoll1.sh unicase/test-ulc-casecoll2.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-ulc-casecoll
diff --git a/modules/unigbrk/ulc-grapheme-breaks-tests
b/modules/unigbrk/ulc-grapheme-breaks-tests
index 187e26f..3e322ae 100644
--- a/modules/unigbrk/ulc-grapheme-breaks-tests
+++ b/modules/unigbrk/ulc-grapheme-breaks-tests
@@ -13,7 +13,7 @@ gt_LOCALE_AR
Makefile.am:
TESTS += unigbrk/test-ulc-grapheme-breaks.sh
-TESTS_ENVIRONMENT += LOCALE_AR='@LOCALE_AR@'
+AM_TESTS_ENVIRONMENT += LOCALE_AR='@LOCALE_AR@'
check_PROGRAMS += test-ulc-grapheme-breaks
test_ulc_grapheme_breaks_SOURCES = unigbrk/test-ulc-grapheme-breaks.c
test_ulc_grapheme_breaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unistdio/u16-vasnprintf-tests
b/modules/unistdio/u16-vasnprintf-tests
index 3dc3cb0..c9e6363 100644
--- a/modules/unistdio/u16-vasnprintf-tests
+++ b/modules/unistdio/u16-vasnprintf-tests
@@ -23,7 +23,7 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-u16-vasnprintf1 unistdio/test-u16-vasnprintf2.sh
unistdio/test-u16-vasnprintf3.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_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) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unistdio/u32-vasnprintf-tests
b/modules/unistdio/u32-vasnprintf-tests
index 555319b..8511a9c 100644
--- a/modules/unistdio/u32-vasnprintf-tests
+++ b/modules/unistdio/u32-vasnprintf-tests
@@ -23,7 +23,7 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-u32-vasnprintf1 unistdio/test-u32-vasnprintf2.sh
unistdio/test-u32-vasnprintf3.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_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) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unistdio/u8-vasnprintf-tests
b/modules/unistdio/u8-vasnprintf-tests
index 8d5e295..cbfceb1 100644
--- a/modules/unistdio/u8-vasnprintf-tests
+++ b/modules/unistdio/u8-vasnprintf-tests
@@ -23,7 +23,7 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-u8-vasnprintf1 unistdio/test-u8-vasnprintf2.sh
unistdio/test-u8-vasnprintf3.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_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) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unistdio/ulc-vasnprintf-tests
b/modules/unistdio/ulc-vasnprintf-tests
index 20e2f71..a3157b3 100644
--- a/modules/unistdio/ulc-vasnprintf-tests
+++ b/modules/unistdio/ulc-vasnprintf-tests
@@ -19,7 +19,7 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-ulc-vasnprintf1 unistdio/test-ulc-vasnprintf2.sh
unistdio/test-ulc-vasnprintf3.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_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) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/uniwbrk/ulc-wordbreaks-tests
b/modules/uniwbrk/ulc-wordbreaks-tests
index 19f1ee6..f76cd94 100644
--- a/modules/uniwbrk/ulc-wordbreaks-tests
+++ b/modules/uniwbrk/ulc-wordbreaks-tests
@@ -13,7 +13,7 @@ gt_LOCALE_FR
Makefile.am:
TESTS += uniwbrk/test-ulc-wordbreaks.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+AM_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) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/update-copyright-tests b/modules/update-copyright-tests
index 3fab6f0..c890baf 100644
--- a/modules/update-copyright-tests
+++ b/modules/update-copyright-tests
@@ -9,4 +9,4 @@ AC_SUBST([abs_aux_dir])
Makefile.am:
TESTS += test-update-copyright.sh
-TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'
+AM_TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'
diff --git a/modules/vasnprintf-posix-tests b/modules/vasnprintf-posix-tests
index 6ba745b..0233c1c 100644
--- a/modules/vasnprintf-posix-tests
+++ b/modules/vasnprintf-posix-tests
@@ -22,5 +22,5 @@ gt_LOCALE_FR_UTF8
Makefile.am:
TESTS += test-vasnprintf-posix test-vasnprintf-posix2.sh test-vasnprintf-posix3
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+AM_TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-vasnprintf-posix test-vasnprintf-posix2
test-vasnprintf-posix3
diff --git a/modules/vc-list-files-tests b/modules/vc-list-files-tests
index a66a45b..5508ff6 100644
--- a/modules/vc-list-files-tests
+++ b/modules/vc-list-files-tests
@@ -12,4 +12,4 @@ AC_SUBST([abs_aux_dir])
Makefile.am:
TESTS += test-vc-list-files-git.sh
TESTS += test-vc-list-files-cvs.sh
-TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'
+AM_TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'
diff --git a/modules/verify-tests b/modules/verify-tests
index 8039030..1e75047 100644
--- a/modules/verify-tests
+++ b/modules/verify-tests
@@ -8,7 +8,7 @@ test-framework-sh
configure.ac:
Makefile.am:
-TESTS_ENVIRONMENT += MAKE='$(MAKE)'
+AM_TESTS_ENVIRONMENT += MAKE='$(MAKE)'
TESTS += test-verify test-verify.sh
check_PROGRAMS += test-verify
diff --git a/modules/wcrtomb-tests b/modules/wcrtomb-tests
index 32f9d3a..edec241 100644
--- a/modules/wcrtomb-tests
+++ b/modules/wcrtomb-tests
@@ -29,7 +29,7 @@ TESTS += \
test-wcrtomb.sh \
test-wcrtomb-w32-1.sh test-wcrtomb-w32-2.sh test-wcrtomb-w32-3.sh \
test-wcrtomb-w32-4.sh test-wcrtomb-w32-5.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_JA='@LOCALE_JA@' \
diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests
index 877dd17..0850a82 100644
--- a/modules/wcsnrtombs-tests
+++ b/modules/wcsnrtombs-tests
@@ -22,7 +22,7 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-wcsnrtombs1.sh test-wcsnrtombs2.sh test-wcsnrtombs3.sh
test-wcsnrtombs4.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_JA='@LOCALE_JA@' \
diff --git a/modules/wcsrtombs-tests b/modules/wcsrtombs-tests
index 4b6bf54..51597d0 100644
--- a/modules/wcsrtombs-tests
+++ b/modules/wcsrtombs-tests
@@ -22,7 +22,7 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-wcsrtombs1.sh test-wcsrtombs2.sh test-wcsrtombs3.sh
test-wcsrtombs4.sh
-TESTS_ENVIRONMENT += \
+AM_TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_JA='@LOCALE_JA@' \
diff --git a/tests/havelib/Makefile.am b/tests/havelib/Makefile.am
index bebff9c..a6746b8 100644
--- a/tests/havelib/Makefile.am
+++ b/tests/havelib/Makefile.am
@@ -55,14 +55,13 @@ EXTRA_DIST = $(TESTS) \
rpath-3aae rpath-3aag rpath-3abe rpath-3abg \
rpathcfg.sh
-TESTS_ENVIRONMENT = top_srcdir=$(srcdir)/../.. srcdir=$(srcdir) \
- OBJEXT='@OBJEXT@' EXEEXT='@EXEEXT@' \
- LIBTOOL='@LIBTOOL@' \
- CC='@CC@' CFLAGS='@CFLAGS@' \
- CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
- LIBDIRSTEM='@LIBDIRSTEM@' \
- CONFIG_SHELL='$(SHELL)' \
- $(SHELL)
+AM_TESTS_ENVIRONMENT = \
+ top_srcdir=$(srcdir)/../.. srcdir=$(srcdir) \
+ OBJEXT='@OBJEXT@' EXEEXT='@EXEEXT@' \
+ LIBTOOL='@LIBTOOL@' CC='@CC@' \
+ CFLAGS='@CFLAGS@' CPPFLAGS='@CPPFLAGS@' \
+ LDFLAGS='@LDFLAGS@' LIBDIRSTEM='@LIBDIRSTEM@' \
+ CONFIG_SHELL='$(SHELL)' $(SHELL)
# Help maintaining config.rpath.
rpathcfg: rpathcfg.sh
diff --git a/tests/init.sh b/tests/init.sh
index 97e4e4b..0c2b6c8 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -30,7 +30,7 @@
# For example, if the programs you want to test are in src/, and this test
# script is named tests/test-1, then you would use "path_prepend_ ../src",
# or perhaps export PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH"
-# to all tests via automake's TESTS_ENVIRONMENT.
+# to all tests via automake's AM_TESTS_ENVIRONMENT.
# Set the exit code 0 for success, 77 for skipped, or 1 or other for failure.
# Use the skip_ and fail_ functions to print a diagnostic and then exit
# with the corresponding exit code.
@@ -48,7 +48,7 @@
# Running a single test, with single-stepping:
# 1. Go into a sub-shell:
# $ bash
-# 2. Set relevant environment variables from TESTS_ENVIRONMENT in the
+# 2. Set relevant environment variables from AM_TESTS_ENVIRONMENT in the
# Makefile:
# $ export srcdir=../../tests # this is an example
# 3. Execute the commands from the test, copy&pasting them one by one:
@@ -69,7 +69,7 @@ Exit () { set +e; (exit $1); exit $1; }
# Print warnings (e.g., about skipped and failed tests) to this file number.
# Override by defining to say, 9, in init.cfg, and putting say,
# export ...ENVVAR_SETTINGS...; $(SHELL) 9>&2
-# in the definition of TESTS_ENVIRONMENT in your tests/Makefile.am file.
+# in the definition of AM_TESTS_ENVIRONMENT in your tests/Makefile.am file.
# This is useful when using automake's parallel tests mode, to print
# the reason for skip/failure to console, rather than to the .log files.
: ${stderr_fileno_=2}
--
2.8.1