diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2013-11-27 15:57:41 -0500 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2013-11-27 15:57:41 -0500 |
| commit | d3f39dfac79cf1a3fd6ad36b29dbebd88447bd1a (patch) | |
| tree | a2d7227ef310223c41fdeb1119df05cd7b16ff79 | |
| parent | c820c93163a611763bb6ebc66d5242de8e100f39 (diff) | |
| parent | 92d3554b0865ada14d1914842dbc5c7eaa3b01a8 (diff) | |
| download | egawk-d3f39dfac79cf1a3fd6ad36b29dbebd88447bd1a.tar.gz egawk-d3f39dfac79cf1a3fd6ad36b29dbebd88447bd1a.tar.bz2 egawk-d3f39dfac79cf1a3fd6ad36b29dbebd88447bd1a.zip | |
Merge branch 'gawk-4.1-stable' to get --include to work.
| -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 c6a82cb1..6d54591a 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 dc495a6b..4eb41ab2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1720,7 +1720,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 @@ -1731,7 +1731,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 89cebe73..3dc9d840 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2115,7 +2115,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 @@ -2126,7 +2126,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:: |