diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 8 | ||||
| -rw-r--r-- | test/Makefile.in | 8 | ||||
| -rw-r--r-- | test/fts.awk | 4 | ||||
| -rw-r--r-- | test/messages.awk | 2 |
5 files changed, 17 insertions, 11 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 7a6a6de4..feedd95b 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2012-10-28 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * messages.awk, fts.awk: Adjusted so make diffout will work. + * Makefile.am (messages): Adjust to use standard failure test for + make diffout. + 2012-10-19 Arnold D. Robbins <arnold@skeeve.com> * symtab1.awk: Adjust to not print ENVIRON and PROCINFO which won't diff --git a/test/Makefile.am b/test/Makefile.am index d5b7bd7f..d3c1b14c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1086,8 +1086,8 @@ poundbang:: messages:: @echo $@ - @$(AWK) -f $(srcdir)/messages.awk >out2 2>out3 - @-$(CMP) $(srcdir)/out1.ok out1 && $(CMP) $(srcdir)/out2.ok out2 && $(CMP) $(srcdir)/out3.ok out3 && rm -f out1 out2 out3 + @$(AWK) -f $(srcdir)/messages.awk >_out2 2>_out3 + @-$(CMP) $(srcdir)/out1.ok _out1 && $(CMP) $(srcdir)/out2.ok _out2 && $(CMP) $(srcdir)/out3.ok _out3 && rm -f _out1 _out2 _out3 argarray:: @echo $@ @@ -1680,7 +1680,7 @@ readdir: fts: @echo $@ @$(AWK) -f $(srcdir)/fts.awk - @-$(CMP) $@.out1 $@.out2 && rm -f $@.out[12] + @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ charasbytes: @echo $@ @@ -1697,7 +1697,7 @@ $(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 out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2 readdir.ok + rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.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 b6e9d657..c148886b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1467,8 +1467,8 @@ poundbang:: messages:: @echo $@ - @$(AWK) -f $(srcdir)/messages.awk >out2 2>out3 - @-$(CMP) $(srcdir)/out1.ok out1 && $(CMP) $(srcdir)/out2.ok out2 && $(CMP) $(srcdir)/out3.ok out3 && rm -f out1 out2 out3 + @$(AWK) -f $(srcdir)/messages.awk >_out2 2>_out3 + @-$(CMP) $(srcdir)/out1.ok _out1 && $(CMP) $(srcdir)/out2.ok _out2 && $(CMP) $(srcdir)/out3.ok _out3 && rm -f _out1 _out2 _out3 argarray:: @echo $@ @@ -2061,7 +2061,7 @@ readdir: fts: @echo $@ @$(AWK) -f $(srcdir)/fts.awk - @-$(CMP) $@.out1 $@.out2 && rm -f $@.out[12] + @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ charasbytes: @echo $@ @@ -3379,7 +3379,7 @@ $(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 out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2 readdir.ok + rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok # An attempt to print something that can be grepped for in build logs pass-fail: diff --git a/test/fts.awk b/test/fts.awk index b90adfb5..a1b49cbd 100644 --- a/test/fts.awk +++ b/test/fts.awk @@ -10,12 +10,12 @@ BEGIN { flags = FTS_PHYSICAL fts(pathlist, flags, data) - output = "fts.out1" + output = "fts.ok" traverse(data) close(output) ftswalk(pathlist, data2) - output = "fts.out2" + output = "_fts" traverse(data2) close(output) diff --git a/test/messages.awk b/test/messages.awk index 555f6e38..50f7d91f 100644 --- a/test/messages.awk +++ b/test/messages.awk @@ -2,7 +2,7 @@ # with and without -c (compatibility) flag, redirecting output # from gawk to a file or not. Some results can be quite unexpected. BEGIN { - print "Goes to a file out1" > "out1" + print "Goes to a file out1" > "_out1" print "Normal print statement" print "This printed on stdout" > "/dev/stdout" print "You blew it!" > "/dev/stderr" |