diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rw-r--r-- | test/Makefile.in | 6 | ||||
| -rw-r--r-- | test/iolint.ok | 22 |
4 files changed, 23 insertions, 17 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 641a9849..d3e866ad 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2021-05-05 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (iolint): Fix for out-of-tree builds. + (testext): Ditto + * iolint.ok: Updated. + 2021-04-14 Arnold D. Robbins <arnold@skeeve.com> * noeffect.awk: Add more test cases. Thanks to Wolfgang Laun diff --git a/test/Makefile.am b/test/Makefile.am index bdb8831f..c0e37642 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2280,8 +2280,8 @@ testext:: @$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \ - then cmp "."/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \ - else cmp "."/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi + then cmp "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \ + else cmp "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi getfile: @echo $@ @@ -2478,7 +2478,7 @@ iolint: @echo $@ @echo hello > 'echo hello' @touch 'exec cat' ; chmod 755 'exec cat' - @$(AWK) -f "$(srcdir)"/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @-$(RM) -f cat 'echo hello' 'exec cat' f1 f2 md5sum diff --git a/test/Makefile.in b/test/Makefile.in index 559e0163..967fbab8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2732,8 +2732,8 @@ testext:: @$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \ - then cmp "."/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \ - else cmp "."/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi + then cmp "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \ + else cmp "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi getfile: @echo $@ @@ -2925,7 +2925,7 @@ iolint: @echo $@ @echo hello > 'echo hello' @touch 'exec cat' ; chmod 755 'exec cat' - @$(AWK) -f "$(srcdir)"/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @-$(RM) -f cat 'echo hello' 'exec cat' f1 f2 md5sum diff --git a/test/iolint.ok b/test/iolint.ok index 5a4ae823..70f1cd2b 100644 --- a/test/iolint.ok +++ b/test/iolint.ok @@ -1,33 +1,33 @@ -gawk: ./iolint.awk:7: warning: `f1' used for input file and for output file +gawk: iolint.awk:7: warning: `f1' used for input file and for output file 0 0 -gawk: ./iolint.awk:16: warning: `echo hello' used for input file and two-way pipe -gawk: ./iolint.awk:17: warning: `echo hello' used for input pipe and two-way pipe -gawk: ./iolint.awk:17: warning: `echo hello' used for input file and input pipe +gawk: iolint.awk:16: warning: `echo hello' used for input file and two-way pipe +gawk: iolint.awk:17: warning: `echo hello' used for input pipe and two-way pipe +gawk: iolint.awk:17: warning: `echo hello' used for input file and input pipe hello hello hello 0 0 0 foo 0 -gawk: ./iolint.awk:30: warning: close: `cat' is not an open file, pipe or co-process +gawk: iolint.awk:30: warning: close: `cat' is not an open file, pipe or co-process -1 -gawk: ./iolint.awk:35: warning: unnecessary mixing of `>' and `>>' for file `f2' +gawk: iolint.awk:35: warning: unnecessary mixing of `>' and `>>' for file `f2' 0 -gawk: ./iolint.awk:37: warning: close: `f2' is not an open file, pipe or co-process +gawk: iolint.awk:37: warning: close: `f2' is not an open file, pipe or co-process -1 -gawk: ./iolint.awk:42: warning: `md5sum' used for output file and output pipe +gawk: iolint.awk:42: warning: `md5sum' used for output file and output pipe b1946ac92492d2347c6235b4d2611184 - 0 0 -gawk: ./iolint.awk:49: warning: `echo hello' used for input pipe and output file +gawk: iolint.awk:49: warning: `echo hello' used for input pipe and output file 0 0 -gawk: ./iolint.awk:60: warning: `exec cat' used for output file and output pipe +gawk: iolint.awk:60: warning: `exec cat' used for output file and output pipe hello 0 0 -gawk: ./iolint.awk:69: warning: `echo hello' used for input pipe and output pipe +gawk: iolint.awk:69: warning: `echo hello' used for input pipe and output pipe hello 0 0 |