diff options
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 15 | ||||
| -rw-r--r-- | test/Makefile.in | 14 | ||||
| -rw-r--r-- | test/fr/LC_MESSAGES/nlstringtest.mo | bin | 0 -> 304 bytes |
4 files changed, 32 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 7ad48010..0226d537 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2018-01-15 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (nlstringtest): New test. + * nlstringtest.awk, nlstringtest.ok, fr/LC_MESSAGES/nlstringtest.mo: + New files. Thanks to Bruno Haible <bruno@clisp.org> + for the test. + 2018-01-04 Arnold D. Robbins <arnold@skeeve.com> Thanks to Andrew Schorr for the basics of this test. diff --git a/test/Makefile.am b/test/Makefile.am index f49cbdc9..8d663c5b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -714,6 +714,9 @@ EXTRA_DIST = \ nlinstr.ok \ nlstrina.awk \ nlstrina.ok \ + nlstringtest.awk \ + nlstringtest.ok \ + fr \ noeffect.awk \ noeffect.ok \ nofile.ok \ @@ -1298,7 +1301,7 @@ LOCALE_CHARSET_TESTS = \ asort asorti backbigs1 backsmalls1 backsmalls2 \ fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \ mbprintf1 mbprintf2 mbprintf3 mbprintf4 mbprintf5 \ - rebt8b2 rtlenmb sort1 sprintfc + nlstringtest rebt8b2 rtlenmb sort1 sprintfc SHLIB_TESTS = \ apiterm \ @@ -1374,13 +1377,14 @@ gawk-extensions: $(GAWK_EXT_TESTS) charset-tests-all: @if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \ + locale -a | grep -i 'fr_FR.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. ; \ - echo %%%%%%%%%% At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \ + echo %%%%%%%%%% At least en_US.UTF-8 fr_FR.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \ fi charset-tests: $(LOCALE_CHARSET_TESTS) @@ -2454,6 +2458,13 @@ nonfatal1: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk 2>&1 | $(AWK) '{print gensub(/invalid:.*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +nlstringtest:: + @echo $@ + @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 LANGUAGE= ; \ + AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + + # Targets generated for other tests: include Maketests diff --git a/test/Makefile.in b/test/Makefile.in index 47ca0371..e5676b51 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -972,6 +972,9 @@ EXTRA_DIST = \ nlinstr.ok \ nlstrina.awk \ nlstrina.ok \ + nlstringtest.awk \ + nlstringtest.ok \ + fr \ noeffect.awk \ noeffect.ok \ nofile.ok \ @@ -1549,7 +1552,7 @@ LOCALE_CHARSET_TESTS = \ asort asorti backbigs1 backsmalls1 backsmalls2 \ fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \ mbprintf1 mbprintf2 mbprintf3 mbprintf4 mbprintf5 \ - rebt8b2 rtlenmb sort1 sprintfc + nlstringtest rebt8b2 rtlenmb sort1 sprintfc SHLIB_TESTS = \ apiterm \ @@ -1815,13 +1818,14 @@ gawk-extensions: $(GAWK_EXT_TESTS) charset-tests-all: @if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \ + locale -a | grep -i 'fr_FR.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. ; \ - echo %%%%%%%%%% At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \ + echo %%%%%%%%%% At least en_US.UTF-8 fr_FR.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \ fi charset-tests: $(LOCALE_CHARSET_TESTS) @@ -2891,6 +2895,12 @@ nonfatal1: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk 2>&1 | $(AWK) '{print gensub(/invalid:.*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +nlstringtest:: + @echo $@ + @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 LANGUAGE= ; \ + AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: diff --git a/test/fr/LC_MESSAGES/nlstringtest.mo b/test/fr/LC_MESSAGES/nlstringtest.mo Binary files differnew file mode 100644 index 00000000..72af97e7 --- /dev/null +++ b/test/fr/LC_MESSAGES/nlstringtest.mo |