diff options
| -rw-r--r-- | test/ChangeLog | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 24 | ||||
| -rw-r--r-- | test/Makefile.in | 24 |
3 files changed, 38 insertions, 14 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 2bd627da..10d707cd 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -2,6 +2,10 @@ * fts.awk: Skip atime to avoid spurious timestamp differences. Thanks to Nelson Beebe for pointing this out. + * Makefile.am (charset-all): Group the charset tests + inside a check for locale support. Thanks to Nelson Beebe + for finally motivating me to do this. + (charset-msg-start): Update test of message some. 2015-04-08 Eli Zaretskii <eliz@gnu.org> diff --git a/test/Makefile.am b/test/Makefile.am index ec84a17f..3973c666 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1125,7 +1125,7 @@ check: msg \ unix-msg-start unix-tests unix-msg-end \ extend-msg-start gawk-extensions extend-msg-end \ machine-msg-start machine-tests machine-msg-end \ - charset-msg-start charset-tests charset-msg-end \ + charset-tests-all \ shlib-msg-start shlib-tests shlib-msg-end \ mpfr-msg-start mpfr-tests mpfr-msg-end @$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; } @@ -1136,6 +1136,16 @@ unix-tests: $(UNIX_TESTS) gawk-extensions: $(GAWK_EXT_TESTS) +charset-tests-all: + @if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \ + locale -a | grep -i 'ru_RU.UTF.*8' > /dev/null && \ + locale -a | grep -i 'ja_JP.UTF.*8' > /dev/null ; \ + then \ + $(MAKE) charset-msg-start charset-tests charset-msg-end; \ + else \ + echo %%%%%%%%%% Inadequate locale support: skipping charset tests. ; \ + fi + charset-tests: $(LOCALE_CHARSET_TESTS) extra: $(EXTRA_TESTS) inet @@ -1198,12 +1208,12 @@ machine-msg-end: charset-msg-start: @echo "======== Starting tests that can vary based on character set or locale support ========" - @echo "************************************************" - @echo "** Some or all of these tests may fail if you **" - @echo "** have inadequate or missing locale support **" - @echo "** At least en_US.UTF-8, ru_RU.UTF-8 and **" - @echo "** ja_JP.UTF-8 are needed. **" - @echo "************************************************" + @echo "**************************************************************************" + @echo "* Some or all of these tests may fail if you have inadequate or missing *" + @echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are *" + @echo "* needed. However, if you see this message, the Makefile thinks you have *" + @echo "* what you need ... *" + @echo "**************************************************************************" charset-msg-end: @echo "======== Done with tests that can vary based on character set or locale support ========" diff --git a/test/Makefile.in b/test/Makefile.in index e4bc045a..c1b691e7 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1565,7 +1565,7 @@ check: msg \ unix-msg-start unix-tests unix-msg-end \ extend-msg-start gawk-extensions extend-msg-end \ machine-msg-start machine-tests machine-msg-end \ - charset-msg-start charset-tests charset-msg-end \ + charset-tests-all \ shlib-msg-start shlib-tests shlib-msg-end \ mpfr-msg-start mpfr-tests mpfr-msg-end @$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; } @@ -1576,6 +1576,16 @@ unix-tests: $(UNIX_TESTS) gawk-extensions: $(GAWK_EXT_TESTS) +charset-tests-all: + @if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \ + locale -a | grep -i 'ru_RU.UTF.*8' > /dev/null && \ + locale -a | grep -i 'ja_JP.UTF.*8' > /dev/null ; \ + then \ + $(MAKE) charset-msg-start charset-tests charset-msg-end; \ + else \ + echo %%%%%%%%%% Inadequate locale support: skipping charset tests. ; \ + fi + charset-tests: $(LOCALE_CHARSET_TESTS) extra: $(EXTRA_TESTS) inet @@ -1638,12 +1648,12 @@ machine-msg-end: charset-msg-start: @echo "======== Starting tests that can vary based on character set or locale support ========" - @echo "************************************************" - @echo "** Some or all of these tests may fail if you **" - @echo "** have inadequate or missing locale support **" - @echo "** At least en_US.UTF-8, ru_RU.UTF-8 and **" - @echo "** ja_JP.UTF-8 are needed. **" - @echo "************************************************" + @echo "**************************************************************************" + @echo "* Some or all of these tests may fail if you have inadequate or missing *" + @echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are *" + @echo "* needed. However, if you see this message, the Makefile thinks you have *" + @echo "* what you need ... *" + @echo "**************************************************************************" charset-msg-end: @echo "======== Done with tests that can vary based on character set or locale support ========" |