diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-20 22:23:03 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-20 22:23:03 +0200 |
| commit | 2a430757c73dbad29b0e63c3904aa9bdbef27ecf (patch) | |
| tree | 6a7257595cfc9ce255be4659799f054f1011ef2a | |
| parent | d88aa6aa32bfc1a1f56a8e25aa0f37553bd2ddce (diff) | |
| parent | cbcc0e3f82d3784c85c7a9cb4c9847f758bf4cac (diff) | |
| download | egawk-2a430757c73dbad29b0e63c3904aa9bdbef27ecf.tar.gz egawk-2a430757c73dbad29b0e63c3904aa9bdbef27ecf.tar.bz2 egawk-2a430757c73dbad29b0e63c3904aa9bdbef27ecf.zip | |
Merge branch 'gawk-4.2-stable'
| -rw-r--r-- | pc/ChangeLog | 9 | ||||
| -rw-r--r-- | pc/Makefile.tst | 16 |
2 files changed, 21 insertions, 4 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index a007290e..2276529b 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,12 @@ +2018-01-20 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.tst: Sync against test/Makefile.in. + For real this time. + +2018-01-20 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (sigpipe1): Fix syntax for non-DJGPP ports. + 2018-01-17 Arnold D. Robbins <arnold@skeeve.com> * Makefile.tst: Sync against test/Makefile.in. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 982d1ce0..3e5bacba 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -227,7 +227,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 \ @@ -1997,6 +1997,12 @@ nlstrina: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || 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 _$@ + noeffect: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -2317,11 +2323,13 @@ setrec1: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ sigpipe1: - @case `uname` in \ + @echo $@ + @-case `uname` in \ *MS-DOS*) echo This test fails on DJGPP --- skipping $@ ;; \ *) \ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ + AWKPATH="$(srcdir)" ; export AWKPATH; \ + $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ esac sortempty: |