diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-09-18 21:46:21 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-09-18 21:46:21 +0300 |
| commit | 664c9b943aecbbf22c591608f26809b10cf4546e (patch) | |
| tree | 55dbb7827895bae164e168c61ac80699442f8cba | |
| parent | 9a124d5aace4595c715665f3b5411f7d0a68c3a1 (diff) | |
| parent | ba56be212f9dee0088322e1560f31b3f4693633d (diff) | |
| download | gawk-664c9b943aecbbf22c591608f26809b10cf4546e.tar.gz | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rw-r--r-- | test/Makefile.in | 10 | ||||
| -rw-r--r-- | test/Maketests | 5 | ||||
| -rw-r--r-- | test/filefuncs.awk | 2 |
5 files changed, 17 insertions, 11 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 68cc18e6..8e89f0d2 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2014-09-18 Arnold D. Robbins <arnold@skeeve.com> + + * filefuncs.awk: Change to build directory instead of "..". + * Makefile.am (filefuncs): Pass in $(abs_top_builddir). + 2014-09-05 Arnold D. Robbins <arnold@skeeve.com> * functab4.awk: Changed to use stat instead of chdir since diff --git a/test/Makefile.am b/test/Makefile.am index 3be8b7cb..1c14ea81 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1972,6 +1972,12 @@ printhuge:: AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +filefuncs: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v builddir="$(abs_top_builddir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + + # Targets generated for other tests: include Maketests diff --git a/test/Makefile.in b/test/Makefile.in index b9753369..b7e25511 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2394,6 +2394,11 @@ printhuge:: @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +filefuncs: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v builddir="$(abs_top_builddir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: @@ -3707,11 +3712,6 @@ fnmatch: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -filefuncs: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - fork: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index 5c34af9e..f8d5e8a9 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1311,11 +1311,6 @@ fnmatch: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -filefuncs: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - fork: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/filefuncs.awk b/test/filefuncs.awk index 4bbfcb55..7aa5ae6a 100644 --- a/test/filefuncs.awk +++ b/test/filefuncs.awk @@ -1,7 +1,7 @@ @load "filefuncs" BEGIN { - if (chdir("..") < 0) { + if (chdir(builddir) < 0) { printf "Error: chdir failed with ERRNO %s\n", ERRNO exit 1 } |