diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 23 | ||||
| -rw-r--r-- | test/Makefile.in | 33 | ||||
| -rw-r--r-- | test/Maketests | 10 |
7 files changed, 53 insertions, 26 deletions
@@ -1,3 +1,7 @@ +2020-03-15 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (zos-diffout): New target. + 2020-03-11 Arnold D. Robbins <arnold@skeeve.com> * main.c: Further message update. Thanks again to diff --git a/Makefile.am b/Makefile.am index 71177ffa..94e961fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -202,7 +202,7 @@ $(srcdir)/pc/Makefile.tst: test/Makefile.in pc/Makefile.tst.prologue pc/GenMakef efence: gawk $(CC) $(AM_LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) -lefence -diffout valgrind-scan: +diffout valgrind-scan zos-diffout: @cd test && $(MAKE) $(AM_MAKEFLAGS) $@ valgrind: diff --git a/Makefile.in b/Makefile.in index 6071f70b..71932418 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1282,7 +1282,7 @@ $(srcdir)/pc/Makefile.tst: test/Makefile.in pc/Makefile.tst.prologue pc/GenMakef efence: gawk $(CC) $(AM_LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) -lefence -diffout valgrind-scan: +diffout valgrind-scan zos-diffout: @cd test && $(MAKE) $(AM_MAKEFLAGS) $@ valgrind: diff --git a/test/ChangeLog b/test/ChangeLog index 17bf99b9..414ae55d 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2020-03-15 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (zos-diffout): New target. + (EXPECTED_FAIL_ZOS): Add more tests to the list. + 2020-03-09 Andrew J. Schorr <aschorr@telemetry-investments.com> * symtab11.ok: Update for @val_type_asc ordering changes. diff --git a/test/Makefile.am b/test/Makefile.am index 2d38a301..08a4e23b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1521,13 +1521,14 @@ EXPECTED_FAIL_MINGW = \ # List of tests that fail on z/OS EXPECTED_FAIL_ZOS = \ aasort aasorti arraysort asort asorti backbigs1 backsmalls1 \ - backsmalls2 charasbytes concat4 dfamb1 double1 double2 fmttest \ - forcenum gsubtst5 ignrcas2 lc_num1 localenl mbfw1 mbprintf1 \ - mbprintf2 mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 numrange \ - printhuge profile5 regrange reint2 rri1 sigpipe1 sortfor sortu \ - subamp subi18n symtab1 symtab8 timeout wideidx wideidx2 \ - widesub widesub2 widesub3 widesub4 \ - beginfile1 beginfile2 clos1way6 errno getlndir nofile nonfatal2 space + 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 \ + 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@ @@ -2449,6 +2450,14 @@ diffout: fi ; \ done | more +# make things easier for z/OS +zos-diffout: + @for i in $(EXPECTED_FAIL_ZOS); do \ + if [ -f _$$i ]; then $(RM) -f _$$i ; \ + else echo $$i apparently passed! please check ; fi ; done + @echo checking for new failures ... + @$(MAKE) diffout + # convenient way to scan valgrind results for errors valgrind-scan: @echo "Scanning valgrind log files for problems:" diff --git a/test/Makefile.in b/test/Makefile.in index d42b6ecd..8c6549d8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1784,13 +1784,14 @@ EXPECTED_FAIL_MINGW = \ # List of tests that fail on z/OS EXPECTED_FAIL_ZOS = \ aasort aasorti arraysort asort asorti backbigs1 backsmalls1 \ - backsmalls2 charasbytes concat4 dfamb1 double1 double2 fmttest \ - forcenum gsubtst5 ignrcas2 lc_num1 localenl mbfw1 mbprintf1 \ - mbprintf2 mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 numrange \ - printhuge profile5 regrange reint2 rri1 sigpipe1 sortfor sortu \ - subamp subi18n symtab1 symtab8 timeout wideidx wideidx2 \ - widesub widesub2 widesub3 widesub4 \ - beginfile1 beginfile2 clos1way6 errno getlndir nofile nonfatal2 space + 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 \ + 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: @@ -4830,7 +4831,7 @@ symtab10: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ symtab11: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -4988,23 +4989,23 @@ mbprintf4: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ mtchi18n: - @echo $@ + @echo $@ $(ZOS_FAIL) @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ru_RU.UTF-8; export GAWKLOCALE; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ rebt8b2: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ sort1: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ sprintfc: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -5146,6 +5147,14 @@ diffout: fi ; \ done | more +# make things easier for z/OS +zos-diffout: + @for i in $(EXPECTED_FAIL_ZOS); do \ + if [ -f _$$i ]; then $(RM) -f _$$i ; \ + else echo $$i apparently passed! please check ; fi ; done + @echo checking for new failures ... + @$(MAKE) diffout + # convenient way to scan valgrind results for errors valgrind-scan: @echo "Scanning valgrind log files for problems:" diff --git a/test/Maketests b/test/Maketests index 30b3ad5c..13063cd0 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1972,7 +1972,7 @@ symtab10: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ symtab11: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2130,23 +2130,23 @@ mbprintf4: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ mtchi18n: - @echo $@ + @echo $@ $(ZOS_FAIL) @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ru_RU.UTF-8; export GAWKLOCALE; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ rebt8b2: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ sort1: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ sprintfc: - @echo $@ + @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ |