diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-26 11:45:04 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-26 11:45:04 +0200 |
| commit | 52627768228f0ae5d7e2191c677be0141d06fc77 (patch) | |
| tree | 8da0a07772bb681738e602f51219280ad3982ae9 | |
| parent | ae6c4b0c356ccfa9050865624b9942fc17792c90 (diff) | |
| parent | c5e244def17ac3380475e05ad5801241f86d2486 (diff) | |
| download | egawk-52627768228f0ae5d7e2191c677be0141d06fc77.tar.gz egawk-52627768228f0ae5d7e2191c677be0141d06fc77.tar.bz2 egawk-52627768228f0ae5d7e2191c677be0141d06fc77.zip | |
Merge branch 'gawk-4.2-stable'
| -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 _$@ |