diff options
| -rw-r--r-- | test/ChangeLog | 9 | ||||
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rw-r--r-- | test/Makefile.in | 11 | ||||
| -rw-r--r-- | test/Maketests | 5 | ||||
| -rw-r--r-- | test/clos1way6.awk | 2 | ||||
| -rw-r--r-- | test/clos1way6.ok2 | 3 |
6 files changed, 20 insertions, 16 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 20c0ea00..35b60f65 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,12 @@ +2016-07-20 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (EXTRA_DIST): Remove clos1way6.ok2. + (close1way6): Removed test, it will be autogenerated back into + the right place. + * clos1way6.awk: Use gensub on ERRNO to force the right text. + Thanks to Andrew Schorr for the suggestion. + * clos1way6.ok2: Removed. + 2016-07-19 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (clos1way6): Add additional file to check result diff --git a/test/Makefile.am b/test/Makefile.am index 3b670f81..f884ba34 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -168,7 +168,6 @@ EXTRA_DIST = \ clos1way5.ok \ clos1way6.awk \ clos1way6.ok \ - clos1way6.ok2 \ closebad.awk \ closebad.ok \ clsflnam.awk \ @@ -2325,11 +2324,6 @@ symtab10: @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -clos1way6: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-($(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@) || ($(CMP) "$(srcdir)"/$@.ok2 _$@ && rm -f _$@) - # Targets generated for other tests: include Maketests diff --git a/test/Makefile.in b/test/Makefile.in index 5885c1e6..45593f15 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -425,7 +425,6 @@ EXTRA_DIST = \ clos1way5.ok \ clos1way6.awk \ clos1way6.ok \ - clos1way6.ok2 \ closebad.awk \ closebad.ok \ clsflnam.awk \ @@ -2762,11 +2761,6 @@ symtab10: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - -clos1way6: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-($(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@) || ($(CMP) "$(srcdir)"/$@.ok2 _$@ && rm -f _$@) Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: @@ -3841,6 +3835,11 @@ clos1way5: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +clos1way6: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + crlf: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index 606e49b9..4c85c44a 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1072,6 +1072,11 @@ clos1way5: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +clos1way6: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + crlf: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/clos1way6.awk b/test/clos1way6.awk index 19779d73..f10c0193 100644 --- a/test/clos1way6.awk +++ b/test/clos1way6.awk @@ -3,5 +3,5 @@ BEGIN { PROCINFO[cmd, "NONFATAL"] = 1 print "test1" |& cmd; close(cmd, "to") fflush(cmd) - print "test2" |& cmd; print ERRNO + print "test2" |& cmd; print gensub(/number/, "descriptor", 1, ERRNO) } diff --git a/test/clos1way6.ok2 b/test/clos1way6.ok2 deleted file mode 100644 index e49cb152..00000000 --- a/test/clos1way6.ok2 +++ /dev/null @@ -1,3 +0,0 @@ -gawk: clos1way6.awk:5: warning: fflush: cannot flush: two-way pipe `cat - 1>&2; sleep 2' has closed write end -test1 -Bad file number |