diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-10-17 12:20:46 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-10-17 12:20:46 +0300 |
| commit | a786967e7e5775d6da6fd94e5113c6cb3c7704f2 (patch) | |
| tree | 1b667c455d7f90aa210fd44374a81eb7d0e03eaf /test | |
| parent | 6f373546792c2befaa2d9d0fffb12fda80320042 (diff) | |
| parent | 49a291d1713912ffb6801ced6f0c517e430a9a71 (diff) | |
| download | egawk-a786967e7e5775d6da6fd94e5113c6cb3c7704f2.tar.gz egawk-a786967e7e5775d6da6fd94e5113c6cb3c7704f2.tar.bz2 egawk-a786967e7e5775d6da6fd94e5113c6cb3c7704f2.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index aa0ddcbe..a9386634 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2014-10-17 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (profile1, testext): Use explicit ./foo.awk to avoid + assumptions about AWKPATH in the environment. + 2014-10-12 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (charset-msg-start): Add a list of needed locales. diff --git a/test/Makefile.am b/test/Makefile.am index 81548186..aae27832 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1673,7 +1673,7 @@ profile1: @echo $@ @$(AWK) -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1 @$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk - @$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out + @$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out @$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \ cp "$(srcdir)"/dtdgport.awk $@.ok ; } @@ -1862,7 +1862,7 @@ inplace3:: testext:: @echo $@ @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk - @$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk readdir: diff --git a/test/Makefile.in b/test/Makefile.in index 8d7790f4..9d264be2 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2098,7 +2098,7 @@ profile1: @echo $@ @$(AWK) -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1 @$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk - @$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out + @$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out @$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \ cp "$(srcdir)"/dtdgport.awk $@.ok ; } @@ -2286,7 +2286,7 @@ inplace3:: testext:: @echo $@ @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk - @$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk readdir: |