[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-108-g92d3554

[Andrew J. Schorr]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.1-stable has been updated
       via  92d3554b0865ada14d1914842dbc5c7eaa3b01a8 (commit)
      from  23186e1b806b231b9850644cd1a9470fd468a790 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=92d3554b0865ada14d1914842dbc5c7eaa3b01a8

commit 92d3554b0865ada14d1914842dbc5c7eaa3b01a8
Author: Andrew J. Schorr <address@hidden>
Date:   Wed Nov 27 15:54:29 2013 -0500

    Add --include long option and tests to make sure that --load and --include 
work.

diff --git a/ChangeLog b/ChangeLog
index f929f46..2295fc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-27         Andrew J. Schorr     <address@hidden>
+
+       * main.c (optab): Add entry for --include.
+
 2013-11-23         Arnold D. Robbins     <address@hidden>
 
        * dfa.c: Merge from grep; minor fixes in how bit twiddling
diff --git a/main.c b/main.c
index 6d99c24..d18a8e3 100644
--- a/main.c
+++ b/main.c
@@ -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 b8ca823..6ff3d8c 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2013-11-27         Andrew J. Schorr     <address@hidden>
+
+       * 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     <address@hidden>
 
        * readdir0.awk: Use `ls -lan' to get numeric user and group ID
diff --git a/test/Makefile.am b/test/Makefile.am
index b92cbf2..892f865 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)"/address@hidden _$@ && 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)"/address@hidden _$@ && rm -f _$@
 
 incdupe::
diff --git a/test/Makefile.in b/test/Makefile.in
index 1f1a275..d34a42d 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)"/address@hidden _$@ && 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)"/address@hidden _$@ && rm -f _$@
 
 incdupe::

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    4 ++++
 main.c           |    1 +
 test/ChangeLog   |    9 +++++++++
 test/Makefile.am |    4 ++--
 test/Makefile.in |    4 ++--
 5 files changed, 18 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
gawk