diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | custom.h | 6 | ||||
| -rw-r--r-- | pc/ChangeLog | 4 | ||||
| -rw-r--r-- | pc/Makefile.tst | 18 | ||||
| -rw-r--r-- | pc/config.h | 6 | ||||
| -rw-r--r-- | profile.c | 1 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 16 | ||||
| -rw-r--r-- | test/Makefile.in | 18 | ||||
| -rw-r--r-- | test/Maketests | 2 |
10 files changed, 49 insertions, 33 deletions
@@ -1,3 +1,9 @@ +2021-05-13 Arnold D. Robbins <arnold@skeeve.com> + + * custom.h: For z/OS, define _REGEX_INCLUDE_LIMITS_H. + * profile.c (pprint): Add a diagnostic print for an + unexprected node type. + 2021-05-05 Arnold D. Robbins <arnold@skeeve.com> * CMakeLists.txt: Removed. @@ -92,6 +92,12 @@ typedef unsigned long long uint_fast64_t; #define _XOPEN_SOURCE_EXTENDED 1 #endif +#ifdef __MVS__ +#ifndef _REGEX_INCLUDE_LIMITS_H +#define _REGEX_INCLUDE_LIMITS_H 1 +#endif +#endif + /* Junk for dfa.[ch] */ /* The __pure__ attribute was added in gcc 2.96. */ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) diff --git a/pc/ChangeLog b/pc/ChangeLog index a2681e29..b2b5559a 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,7 @@ +2021-05-13 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.tst: Regenerated. + 2021-05-12 Arnold D. Robbins <arnold@skeeve.com> * GenMakefileTst.awk: Fix the test for the @echo line. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 2b495991..a36356a3 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -342,13 +342,12 @@ EXPECTED_FAIL_ZOS = \ aasort aasorti arraysort asort asorti backbigs1 backsmalls1 \ backsmalls2 beginfile1 beginfile2 charasbytes clos1way6 concat4 \ dfamb1 double1 double2 errno fmttest forcenum getlndir gsubtst5 \ - ignrcas2 lc_num1 localenl localenl mbfw1 mbprintf1 mbprintf2 \ - mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n nlstringtest \ - nofile nonfatal2 numrange printhuge profile5 profile5 rebt8b2 \ - posix_compare \ - regrange reint2 rri1 sigpipe1 sort1 sortfor sortu space sprintfc \ - subamp subi18n symtab1 symtab11 symtab8 timeout wideidx wideidx2 \ - widesub widesub2 widesub3 widesub4 + ignrcas2 inf-nan-torture iolint lc_num1 localenl mbfw1 mbprintf1 \ + mbprintf2 mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n \ + nlstringtest nofile nonfatal2 numrange posix_compare printhuge \ + profile5 rebt8b2 regrange reint2 rri1 sigpipe1 sort1 sortfor \ + sortu space sprintfc subamp subi18n symtab1 symtab11 symtab8 \ + timeout wideidx wideidx2 widesub widesub2 widesub3 widesub4 # List of the files that appear in manual tests or are for reserve testing: @@ -2906,7 +2905,7 @@ indirectcall2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ inf-nan-torture: - @echo $@ + @echo $@ $(ZOS_FAIL) @echo Expect $@ to fail with MinGW. @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -3641,8 +3640,7 @@ Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests clean-local: rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ - readdir_test.ok readdir_retest.ok \ - profile1.ok + readdir_test.ok readdir_retest.ok profile1.ok X_* # An attempt to print something that can be grepped for in build logs pass-fail: diff --git a/pc/config.h b/pc/config.h index 19f6fcae..a3303741 100644 --- a/pc/config.h +++ b/pc/config.h @@ -464,7 +464,7 @@ #define PACKAGE_NAME "GNU Awk" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU Awk 5.1.1c" +#define PACKAGE_STRING "GNU Awk 5.1.1d" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gawk" @@ -473,7 +473,7 @@ #define PACKAGE_URL "http://www.gnu.org/software/gawk/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.1.1c" +#define PACKAGE_VERSION "5.1.1d" /* Define to 1 if *printf supports %a format */ #define PRINTF_HAS_A_FORMAT 1 @@ -534,7 +534,7 @@ /* Version number of package */ -#define VERSION "5.1.1c" +#define VERSION "5.1.1d" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE @@ -373,6 +373,7 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, int flags) break; default: + fprintf(stderr, "Got unexpected type %s\n", nodetype2str(m->type)); cant_happen(); } diff --git a/test/ChangeLog b/test/ChangeLog index 896a8e8b..991c4caf 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2021-05-13 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (EXPECTED_FAIL_ZOS): Updated and sorted / uniqued. + (clean-local): Remove X_* files from diffout-zos. + 2021-05-12 Arnold D. Robbins <arnold@skeeve.com> * localenl.sh: Fix for Bash 5.1. Thanks to diff --git a/test/Makefile.am b/test/Makefile.am index c7f5d108..3b8815d8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1582,13 +1582,12 @@ EXPECTED_FAIL_ZOS = \ aasort aasorti arraysort asort asorti backbigs1 backsmalls1 \ backsmalls2 beginfile1 beginfile2 charasbytes clos1way6 concat4 \ dfamb1 double1 double2 errno fmttest forcenum getlndir gsubtst5 \ - ignrcas2 lc_num1 localenl localenl mbfw1 mbprintf1 mbprintf2 \ - mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n nlstringtest \ - nofile nonfatal2 numrange printhuge profile5 profile5 rebt8b2 \ - posix_compare \ - regrange reint2 rri1 sigpipe1 sort1 sortfor sortu space sprintfc \ - subamp subi18n symtab1 symtab11 symtab8 timeout wideidx wideidx2 \ - widesub widesub2 widesub3 widesub4 + ignrcas2 inf-nan-torture iolint lc_num1 localenl mbfw1 mbprintf1 \ + mbprintf2 mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n \ + nlstringtest nofile nonfatal2 numrange posix_compare printhuge \ + profile5 rebt8b2 regrange reint2 rri1 sigpipe1 sort1 sortfor \ + sortu space sprintfc subamp subi18n symtab1 symtab11 symtab8 \ + timeout wideidx wideidx2 widesub widesub2 widesub3 widesub4 ZOS_FAIL = @ZOS_FAIL@ @@ -2499,8 +2498,7 @@ Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests clean-local: rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ - readdir_test.ok readdir_retest.ok \ - profile1.ok + readdir_test.ok readdir_retest.ok profile1.ok X_* # An attempt to print something that can be grepped for in build logs pass-fail: diff --git a/test/Makefile.in b/test/Makefile.in index 75bf251e..43003216 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1847,13 +1847,12 @@ EXPECTED_FAIL_ZOS = \ aasort aasorti arraysort asort asorti backbigs1 backsmalls1 \ backsmalls2 beginfile1 beginfile2 charasbytes clos1way6 concat4 \ dfamb1 double1 double2 errno fmttest forcenum getlndir gsubtst5 \ - ignrcas2 lc_num1 localenl localenl mbfw1 mbprintf1 mbprintf2 \ - mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n nlstringtest \ - nofile nonfatal2 numrange printhuge profile5 profile5 rebt8b2 \ - posix_compare \ - regrange reint2 rri1 sigpipe1 sort1 sortfor sortu space sprintfc \ - subamp subi18n symtab1 symtab11 symtab8 timeout wideidx wideidx2 \ - widesub widesub2 widesub3 widesub4 + ignrcas2 inf-nan-torture iolint lc_num1 localenl mbfw1 mbprintf1 \ + mbprintf2 mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n \ + nlstringtest nofile nonfatal2 numrange posix_compare printhuge \ + profile5 rebt8b2 regrange reint2 rri1 sigpipe1 sort1 sortfor \ + sortu space sprintfc subamp subi18n symtab1 symtab11 symtab8 \ + timeout wideidx wideidx2 widesub widesub2 widesub3 widesub4 # List of the files that appear in manual tests or are for reserve testing: @@ -4575,7 +4574,7 @@ indirectcall2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ inf-nan-torture: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -5293,8 +5292,7 @@ Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests clean-local: rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ - readdir_test.ok readdir_retest.ok \ - profile1.ok + readdir_test.ok readdir_retest.ok profile1.ok X_* # An attempt to print something that can be grepped for in build logs pass-fail: diff --git a/test/Maketests b/test/Maketests index d3c4a231..fabc2ad5 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1638,7 +1638,7 @@ indirectcall2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ inf-nan-torture: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ |