diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | main.c | 1 | ||||
| -rw-r--r-- | test/ChangeLog | 9 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 4 |
5 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2013-11-27 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * main.c (optab): Add entry for --include. + 2013-11-23 Arnold D. Robbins <arnold@skeeve.com> * dfa.c: Merge from grep; minor fixes in how bit twiddling @@ -176,6 +176,7 @@ static const struct option optab[] = { { "file", required_argument, NULL, 'f' }, { "re-interval", no_argument, NULL, 'r' }, { "source", required_argument, NULL, 'e' }, + { "include", required_argument, NULL, 'i' }, { "load", required_argument, NULL, 'l' }, { "dump-variables", optional_argument, NULL, 'd' }, { "assign", required_argument, NULL, 'v' }, diff --git a/test/ChangeLog b/test/ChangeLog index b8ca8236..6ff3d8ca 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,12 @@ +2013-11-27 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (ordchr2): Use --load instead of -l to make sure the + long option works properly. Note that the readfile test still uses + the short version. + (include2): Use --include instead of -i to make sure that the long + option works properly. Note that many other tests use the -i short + version. + 2013-11-20 Arnold D. Robbins <arnold@skeeve.com> * readdir0.awk: Use `ls -lan' to get numeric user and group ID diff --git a/test/Makefile.am b/test/Makefile.am index b92cbf24..892f8657 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1718,7 +1718,7 @@ jarebug:: ordchr2:: @echo $@ - @$(AWK) -l ordchr 'BEGIN {print chr(ord("z"))}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) --load ordchr 'BEGIN {print chr(ord("z"))}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ # N.B. If the test fails, create readfile.ok so that "make diffout" will work @@ -1729,7 +1729,7 @@ readfile:: include2:: @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -i inclib 'BEGIN {print sandwich("a", "b", "c")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) --include inclib 'BEGIN {print sandwich("a", "b", "c")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ incdupe:: diff --git a/test/Makefile.in b/test/Makefile.in index 1f1a2757..d34a42d2 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2113,7 +2113,7 @@ jarebug:: ordchr2:: @echo $@ - @$(AWK) -l ordchr 'BEGIN {print chr(ord("z"))}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) --load ordchr 'BEGIN {print chr(ord("z"))}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ # N.B. If the test fails, create readfile.ok so that "make diffout" will work @@ -2124,7 +2124,7 @@ readfile:: include2:: @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -i inclib 'BEGIN {print sandwich("a", "b", "c")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) --include inclib 'BEGIN {print sandwich("a", "b", "c")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ incdupe:: |