[gawk-diffs] [SCM] gawk branch, feature/improve-tests, updated. gawk-4.1.0-3111-g5b972ef

[Arnold Robbins]

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, feature/improve-tests has been updated
       via  5b972ef85ccb34bbab5c2dc4be18c45e3edca1f8 (commit)
      from  2dfaa01c11933760021b89154d95eae8e3d4ad8a (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=5b972ef85ccb34bbab5c2dc4be18c45e3edca1f8

commit 5b972ef85ccb34bbab5c2dc4be18c45e3edca1f8
Author: Arnold D. Robbins <address@hidden>
Date:   Thu May 10 14:43:33 2018 -0400

    Change readfile test to use test/Makefile.am.

diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 6775cf9..93c8b44 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -857,8 +857,8 @@ ordchr2::
 # N.B. If the test fails, create readfile.ok so that "make diffout" will work
 readfile::
        @echo $@
-       @$(AWK) -l readfile 'BEGIN {printf "%s", readfile("Makefile")}' >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) Makefile _$@ && rm -f _$@ || cp -p Makefile address@hidden
+       @$(AWK) -l readfile 'BEGIN {printf "%s", 
readfile("$(srcdir)/Makefile.am")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)/Makefile.am" _$@ && rm -f _$@ || cp -p Makefile 
address@hidden
 
 readfile2::
        @echo $@
diff --git a/test/ChangeLog b/test/ChangeLog
index 12cfdf0..10fca69 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-10         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (readfile): Use $(srcdir)/Makefile.am as the
+       target to read and compare against. We hope this avoids
+       issues with CR/LF on Windows...
+
 2018-05-06         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (SORT): New variable, to improve consistency with
diff --git a/test/Makefile.am b/test/Makefile.am
index e9298f6..6c69b38 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1943,8 +1943,8 @@ ordchr2::
 # N.B. If the test fails, create readfile.ok so that "make diffout" will work
 readfile::
        @echo $@
-       @$(AWK) -l readfile 'BEGIN {printf "%s", readfile("Makefile")}' >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) Makefile _$@ && rm -f _$@ || cp -p Makefile address@hidden
+       @$(AWK) -l readfile 'BEGIN {printf "%s", 
readfile("$(srcdir)/Makefile.am")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)/Makefile.am" _$@ && rm -f _$@ || cp -p Makefile 
address@hidden
 
 readfile2::
        @echo $@
diff --git a/test/Makefile.in b/test/Makefile.in
index 87cec0d..ff1727c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2388,8 +2388,8 @@ ordchr2::
 # N.B. If the test fails, create readfile.ok so that "make diffout" will work
 readfile::
        @echo $@
-       @$(AWK) -l readfile 'BEGIN {printf "%s", readfile("Makefile")}' >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) Makefile _$@ && rm -f _$@ || cp -p Makefile address@hidden
+       @$(AWK) -l readfile 'BEGIN {printf "%s", 
readfile("$(srcdir)/Makefile.am")}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)/Makefile.am" _$@ && rm -f _$@ || cp -p Makefile 
address@hidden
 
 readfile2::
        @echo $@

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

Summary of changes:
 pc/Makefile.tst  | 4 ++--
 test/ChangeLog   | 6 ++++++
 test/Makefile.am | 4 ++--
 test/Makefile.in | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
gawk