diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-06-26 12:35:09 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-06-26 12:35:09 +0300 |
| commit | 0a2de15cba710ff67107bc340950515e1a29edb5 (patch) | |
| tree | ec6f335a823fe1240a3dfddf2a0f8197fcdfd31b | |
| parent | 077f43dbe53c80e3edb974454e25c3f0c93d0fd5 (diff) | |
| download | egawk-0a2de15cba710ff67107bc340950515e1a29edb5.tar.gz egawk-0a2de15cba710ff67107bc340950515e1a29edb5.tar.bz2 egawk-0a2de15cba710ff67107bc340950515e1a29edb5.zip | |
Fix `make check' when building out of the source tree.
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rw-r--r-- | test/Makefile.in | 6 | ||||
| -rw-r--r-- | test/getfile.ok | 8 |
4 files changed, 15 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index f0717584..6b88e287 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -9,6 +9,11 @@ * id.ok: Update after code changes. + Unrelated: + + * Makefile.am (getfile, dbugtypedre1, dbugtypedre2): Fixed to + work if building out of the source tree. + 2015-06-25 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (negtime): Fix out-of-tree test run. diff --git a/test/Makefile.am b/test/Makefile.am index b309d0b4..cfcc9d9e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2000,7 +2000,7 @@ testext:: getfile: @echo $@ - @$(AWK) -v TESTEXT_QUIET=1 -ltestext -f $(srcdir)/$@.awk $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -v TESTEXT_QUIET=1 -ltestext -f $@.awk < $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ readdir: @@ -2141,12 +2141,12 @@ negtime:: dbugtypedre1: @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < $@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ dbugtypedre2: @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < $@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ # Targets generated for other tests: diff --git a/test/Makefile.in b/test/Makefile.in index a30d6b2a..f850f59c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2437,7 +2437,7 @@ testext:: getfile: @echo $@ - @$(AWK) -v TESTEXT_QUIET=1 -ltestext -f $(srcdir)/$@.awk $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -v TESTEXT_QUIET=1 -ltestext -f $@.awk < $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ readdir: @@ -2577,12 +2577,12 @@ negtime:: dbugtypedre1: @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < $@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ dbugtypedre2: @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < $@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program diff --git a/test/getfile.ok b/test/getfile.ok index 92c915f2..1109a303 100644 --- a/test/getfile.ok +++ b/test/getfile.ok @@ -1,16 +1,16 @@ BEGIN -gawk: ./getfile.awk:9: warning: cannot open unrecognized file type `<<' for `echo hello; echo goodbye' +gawk: getfile.awk:9: warning: cannot open unrecognized file type `<<' for `echo hello; echo goodbye' get_file: get_file(echo hello; echo goodbye, <<, -1) failed expected error result 0 get_file returned 1 input_name echo hello; echo goodbye 1 hello -BEGINFILE (getfile.awk) ERRNO () +BEGINFILE (-) ERRNO () get_file returned 1 -input_name getfile.awk +input_name - end BEGIN -ENDFILE (getfile.awk) ERRNO () +ENDFILE (-) ERRNO () END 1 goodbye |