diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-04-25 21:37:34 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-04-25 21:37:34 +0300 |
| commit | b02d653bfe4017fcc84455e171cf7366fe7da09c (patch) | |
| tree | bc009b964faba95890fa50cdcf7c6de57e62ff28 | |
| parent | b902be41919a9b13c915cda67446c58f16f39b41 (diff) | |
| parent | 2762b8ff355e33ede7bcd71efbaf076b54a4e43b (diff) | |
| download | egawk-b02d653bfe4017fcc84455e171cf7366fe7da09c.tar.gz egawk-b02d653bfe4017fcc84455e171cf7366fe7da09c.tar.bz2 egawk-b02d653bfe4017fcc84455e171cf7366fe7da09c.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | pc/ChangeLog | 5 | ||||
| -rw-r--r-- | pc/Makefile.tst | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index b6ecad83..d5516964 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,8 @@ +2015-04-22 Scott Deifik <scottd.mail@sbcglobal.net> + + * Makefile.tst: Don't do 'make diffout' after pass-fail. + * negtime: Add expect failure for DJGPP. + 2015-04-17 Eli Zaretskii <eliz@gnu.org> * testoutcmp.awk (END): Attempt a series of massages on the actual diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 0e837a73..7f579738 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -250,8 +250,8 @@ check: msg \ machine-msg-start machine-tests machine-msg-end \ charset-tests-all \ shlib-msg-start shlib-tests shlib-msg-end \ - mpfr-msg-start mpfr-tests mpfr-msg-end - @$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; } + mpfr-msg-start mpfr-tests mpfr-msg-end \ + pass-fail basic: $(BASIC_TESTS) @@ -1231,7 +1231,7 @@ paramasfunc2:: negtime:: @echo $@ - @echo Expect negtime to fail with MinGW + @echo Expect negtime to fail with MinGW and DJGPP @TZ=GMT AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: |