diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 12 | ||||
| -rw-r--r-- | test/Makefile.in | 11 | ||||
| -rw-r--r-- | test/rtlenmb.ok | 3 |
5 files changed, 25 insertions, 12 deletions
@@ -24,10 +24,6 @@ Minor Cleanups and Code Improvements regex.h - remove underscores in param names - From Andy: Review the following test cases that they work with - make diffout. These look suspicious: mmap8k, fmtspcl (the mpfr - case), clobber, getlnbuf, rtlenmb, profile1, rand (mpfr case). - Add tests for patches in emails (?? - not sure now what this referred to) diff --git a/test/ChangeLog b/test/ChangeLog index ef51fd68..077d6314 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2013-01-16 Arnold D. Robbins <arnold@skeeve.com> + + Fix tests to work with make diffout: + + * Makefile.am (clobber, mmap8k, rtlenmb): Tests adjusted. + * rtlenmb.ok: New file. + 2013-01-15 Andrew J. Schorr <aschorr@telemetry-investments.com> * Gentests: Remove a debugging printf. diff --git a/test/Makefile.am b/test/Makefile.am index b82b6040..b1bca554 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1220,7 +1220,7 @@ tweakfld:: mmap8k:: @echo $@ @$(AWK) '{ print }' $(srcdir)/mmap8k.in >_$@ - @-$(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@ + @-$(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@ || cp $(srcdir)/$@.in $@.ok tradanch:: @echo $@ @@ -1443,7 +1443,7 @@ rtlenmb:: @echo $@ @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \ $(srcdir)/rtlen.sh >_$@ || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/rtlen.ok _$@ && rm -f _$@ + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ nondec2:: @echo $@ @@ -1563,7 +1563,9 @@ profile1: @echo $@ @$(AWK) --pretty-print=ap-$@.out -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > _$@.out1 @$(AWK) -f ap-$@.out $(srcdir)/dtdgport.awk > _$@.out2 ; rm ap-$@.out - @cmp _$@.out1 _$@.out2 && rm _$@.out[12] || echo EXIT CODE: $$? >>_$@ + @$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \ + cp $(srcdir)/dtdgport.awk > $@.ok ; } + profile2: @echo $@ @@ -1760,7 +1762,9 @@ $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests $(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests clean: - rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok + rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ + seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ + mmap8k.ok profile1.ok # 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 edc472c0..5d7fb870 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1601,7 +1601,7 @@ tweakfld:: mmap8k:: @echo $@ @$(AWK) '{ print }' $(srcdir)/mmap8k.in >_$@ - @-$(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@ + @-$(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@ || cp $(srcdir)/$@.in $@.ok tradanch:: @echo $@ @@ -1824,7 +1824,7 @@ rtlenmb:: @echo $@ @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \ $(srcdir)/rtlen.sh >_$@ || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/rtlen.ok _$@ && rm -f _$@ + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ nondec2:: @echo $@ @@ -1944,7 +1944,8 @@ profile1: @echo $@ @$(AWK) --pretty-print=ap-$@.out -f $(srcdir)/xref.awk $(srcdir)/dtdgport.awk > _$@.out1 @$(AWK) -f ap-$@.out $(srcdir)/dtdgport.awk > _$@.out2 ; rm ap-$@.out - @cmp _$@.out1 _$@.out2 && rm _$@.out[12] || echo EXIT CODE: $$? >>_$@ + @$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \ + cp $(srcdir)/dtdgport.awk > $@.ok ; } profile2: @echo $@ @@ -3474,7 +3475,9 @@ $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests $(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests clean: - rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok + rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ + seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ + mmap8k.ok profile1.ok # An attempt to print something that can be grepped for in build logs pass-fail: diff --git a/test/rtlenmb.ok b/test/rtlenmb.ok new file mode 100644 index 00000000..b8a484df --- /dev/null +++ b/test/rtlenmb.ok @@ -0,0 +1,3 @@ +3 +5 +2 |