diff options
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 8 | ||||
| -rw-r--r-- | test/Makefile.in | 8 | ||||
| -rw-r--r-- | test/nlstringtest-nogettext.ok | 5 |
4 files changed, 26 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 65f01e62..cd3813cc 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2018-03-05 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (EXTRA_DIST): Add nlstringtest-nogettext.ok. + * (nlstringtest): Compare to nlstringtest-nogettext.ok first, + in case gawk was built without GNU gettext. + * nlstringtest-nogettext.ok: New file. + 2018-02-25 Arnold D. Robbins <arnold@skeeve.com> * 4.2.1: Release tar ball made. diff --git a/test/Makefile.am b/test/Makefile.am index bf1dbd32..f0cd20d1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -720,6 +720,7 @@ EXTRA_DIST = \ nlstringtest.awk \ nlstringtest.ok \ nlstringtest.po \ + nlstringtest-nogettext.ok \ fr \ noeffect.awk \ noeffect.ok \ @@ -2477,7 +2478,12 @@ nlstringtest:: @echo $@ @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \ + then \ + rm -f _$@ ; \ + else \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ + fi # Targets generated for other tests: diff --git a/test/Makefile.in b/test/Makefile.in index f96151be..927544fa 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -978,6 +978,7 @@ EXTRA_DIST = \ nlstringtest.awk \ nlstringtest.ok \ nlstringtest.po \ + nlstringtest-nogettext.ok \ fr \ noeffect.awk \ noeffect.ok \ @@ -2914,7 +2915,12 @@ nlstringtest:: @echo $@ @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \ + then \ + rm -f _$@ ; \ + else \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ + fi Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: diff --git a/test/nlstringtest-nogettext.ok b/test/nlstringtest-nogettext.ok new file mode 100644 index 00000000..3834800c --- /dev/null +++ b/test/nlstringtest-nogettext.ok @@ -0,0 +1,5 @@ +2 pieces of cake +%s is replaced by %s. +%s is replaced by %s. + +FF is replaced by EUR. |