diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-26 11:45:31 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-26 11:45:31 +0200 |
| commit | 7c06b4c0b81bd6acbf6d3a90be4db2862caccf06 (patch) | |
| tree | 13692edad12b07cf1754a832df9aacfd0c1741c3 | |
| parent | 9fcde376b4fd901bf851b7e6695c96eb53cd9f63 (diff) | |
| parent | 52627768228f0ae5d7e2191c677be0141d06fc77 (diff) | |
| download | egawk-7c06b4c0b81bd6acbf6d3a90be4db2862caccf06.tar.gz egawk-7c06b4c0b81bd6acbf6d3a90be4db2862caccf06.tar.bz2 egawk-7c06b4c0b81bd6acbf6d3a90be4db2862caccf06.zip | |
Merge branch 'master' into feature/fix-comments
| -rw-r--r-- | pc/ChangeLog | 5 | ||||
| -rw-r--r-- | pc/Makefile.tst | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index b8a34dfa..1f2d00dd 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,8 @@ +2018-01-26 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (nlstringtest): Expected failure on MinGW when not + built with gettext. + 2018-01-22 Juan Manuel Guerrero <juan.guerrero@gmx.de> * pc/Makefile.tst (nlstringtest): Update the expected failure diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 0ad89736..e850d2d4 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -1999,8 +1999,9 @@ nlstrina: nlstringtest:: @echo $@ - @echo Expect nlstringtest to fail with DJGPP. - @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 LANGUAGE= ; \ + @echo Expect nlstringtest to fail with DJGPP and MinGW when not built with gettext. +# @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 LANGUAGE= + @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=FRA_FRA.1252 LANGUAGE= ; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ |