diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-01-14 21:05:39 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-01-14 21:05:39 +0200 |
| commit | 74f4ac827622e938bb43d079dcaa87f1db749c63 (patch) | |
| tree | 1854a0f1bee8e73f755dd8510cc20a69f9e13bc5 | |
| parent | 3b3ef9d35be3b22fd643e0a4edf8c136f6a7ca65 (diff) | |
| parent | 94890fcc0514fb5704320c504ce2215678ebc307 (diff) | |
| download | egawk-74f4ac827622e938bb43d079dcaa87f1db749c63.tar.gz egawk-74f4ac827622e938bb43d079dcaa87f1db749c63.tar.bz2 egawk-74f4ac827622e938bb43d079dcaa87f1db749c63.zip | |
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gawk
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/symtab8.ok | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 574acbdb..822b1db6 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -5,6 +5,12 @@ * Gentests: For MPFR tests, add $(AWKFLAGS) on the command lie. * mpfr-rand.ok: Updated. +2013-01-14 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (symtab8): Use grep to remove FILENAME from the output + so the test will succeed when building outside the source tree. + * symtab8.ok: Remove FILENAME. + 2013-01-10 Andrew J. Schorr <aschorr@telemetry-investments.com> * inplace.1.in, inplace.2.in, inplace.in, inplace1.1.ok, inplace1.2.ok, diff --git a/test/Makefile.am b/test/Makefile.am index 6c74385a..593013bc 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1750,7 +1750,7 @@ symtab6: symtab8: @echo $@ @$(AWK) -d__$@ -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ - @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' >> _$@ ; rm __$@ + @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' | grep -v '^FILENAME' >> _$@ ; rm __$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ # Targets generated for other tests: diff --git a/test/Makefile.in b/test/Makefile.in index e3affc59..d2052480 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2131,7 +2131,7 @@ symtab6: symtab8: @echo $@ @$(AWK) -d__$@ -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ - @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' >> _$@ ; rm __$@ + @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' | grep -v '^FILENAME' >> _$@ ; rm __$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program diff --git a/test/symtab8.ok b/test/symtab8.ok index 8560c75a..724f374b 100644 --- a/test/symtab8.ok +++ b/test/symtab8.ok @@ -6,7 +6,6 @@ BINMODE: 0 CONVFMT: "%.6g" ERRNO: "" FIELDWIDTHS: "" -FILENAME: "./symtab8.in" FNR: 1 FPAT: "[^[:space:]]+" FS: " " |