[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. d2d2d24b400c8d7b3cc167687d25001f5b30152e

[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, gawk-4.0-stable has been updated
       via  d2d2d24b400c8d7b3cc167687d25001f5b30152e (commit)
       via  623485504abc2f256f51f49370f24b1e35dce1cb (commit)
      from  f6bbdea8c4e2d3bd13cbbddd65fe67bcd7621fd2 (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=d2d2d24b400c8d7b3cc167687d25001f5b30152e

commit d2d2d24b400c8d7b3cc167687d25001f5b30152e
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Feb 22 23:36:33 2012 +0200

    Additional fixes from Eli for MinGW.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index c0d5c31..b20fbd6 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22         Eli Zaretskii  <address@hidden>
+
+       * Makefile.tst: Update CMP and CP definitions, add "Expect xxxx to
+       fail with MinGW" messages as needed.
+
 2012-02-15         Arnold D. Robbins     <address@hidden>
 
        * gawkmisc.pc (execvp): Modify signature, return -1
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 5f8ca61..6dc5672 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -86,8 +86,8 @@ PGAWK = ../pgawk.exe
 #CMP = cmp
 # See the comment above for why you might want to set CMP to "env LFN=n diff"
 #CMP = env LFN=n diff
-CMP = diff
-#CMP = diff -c
+#CMP = diff
+CMP = diff -u
 #CMP = gcmp
 
 # cmp replacement program for PC where the error messages aren't
@@ -96,9 +96,9 @@ TESTOUTCMP = $(AWK) -f ../testoutcmp.awk
 
 # Set your "cp," "mv," and "mkdir" commands here.  Note: DOS's copy must take
 # forward slashes.
-#CP = cp
+CP = cp
 #CP = : && command -c copy
-CP  = command.com /c copy
+#CP  = command.com /c copy
 
 MV = cmd.exe /c ren
 
@@ -449,6 +449,7 @@ pipeio1::
 
 pipeio2::
        @echo $@
+       @echo Expect pipeio2 to fail with MinGW
        @$(AWK) -v SRCDIR=$(srcdir) -f $(srcdir)/pipeio2.awk >_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -672,6 +673,7 @@ devfd1::
 # The program text is the '1' which will print each record. How compact can 
you get?
 devfd2::
        @echo $@
+       @echo Expect devfd2 to fail in MinGW
        @$(AWK) 1 /dev/fd/4 /dev/fd/5 4< $(srcdir)/devfd.in1 5< 
$(srcdir)/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -699,7 +701,7 @@ localenl::
 
 mbprintf1::
        @echo $@
-       @echo Expect mbprintf1 to fail with DJGPP.
+       @echo Expect mbprintf1 to fail with DJGPP and MinGW.
        @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
        $(AWK) -f $(srcdir)/address@hidden $(srcdir)/address@hidden >_$@ 2>&1 
|| echo EXIT CODE: $$? >> _$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
@@ -718,7 +720,7 @@ mbprintf3::
 
 mbfw1::
        @echo $@
-       @echo Expect mbfw1 to fail with DJGPP.
+       @echo Expect mbfw1 to fail with DJGPP and MinGW.
        @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
        $(AWK) -f $(srcdir)/address@hidden $(srcdir)/address@hidden >_$@ 2>&1 
|| echo EXIT CODE: $$? >> _$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
@@ -741,7 +743,7 @@ printfbad2: printfbad2.ok
 
 beginfile1::
        @echo $@
-       @echo Expect beginfile1 to fail with DJGPP
+       @echo Expect beginfile1 to fail with DJGPP and MinGW
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden $(srcdir)/address@hidden . 
./no/such/file Makefile  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -788,6 +790,7 @@ next:
 
 exit:
        @echo $@
+       @echo Expect exit to fail with MinGW
        @-AWK="$(AWKPROG)" $(srcdir)/address@hidden > _$@ 2>&1
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -1005,6 +1008,7 @@ eofsplit:
 
 exitval2:
        @echo exitval2
+       @echo Expect exitval2 to fail with MinGW
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -1170,6 +1174,7 @@ hex:
 
 hsprint:
        @echo hsprint
+       @echo Expect hsprint to fail with MinGW due to 3 digits in %e output
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -1506,11 +1511,13 @@ rstest3:
 
 rstest4:
        @echo rstest4
+       @echo Expect rstest4 to fail with MinGW
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 rstest5:
        @echo rstest5
+       @echo Expect rstest5 to fail with MinGW
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -1779,7 +1786,7 @@ gensub2:
 
 getlndir:
        @echo getlndir
-       @echo Expect getlndir to fail with DJGPP.
+       @echo Expect getlndir to fail with DJGPP and MinGW.
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -1875,6 +1882,7 @@ patsplit:
 
 posix:
        @echo posix
+       @echo Expect posix to fail with MinGW due to 3 digits in e+NNN exponent
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  < $(srcdir)/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -1890,7 +1898,7 @@ procinfs:
 
 pty1:
        @echo pty1
-       @echo Expect pty1 to fail with DJGPP.
+       @echo Expect pty1 to fail with DJGPP and MinGW.
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -1946,6 +1954,7 @@ double1:
 
 double2:
        @echo double2
+       @echo Expect double2 to fail with MinGW due to 3 digits in e+NNN 
exponents
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
@@ -1966,6 +1975,7 @@ asorti:
 
 fmttest:
        @echo fmttest
+       @echo Expect fmttest to fail with MinGW due to 3 digits in e+NNN 
exponents
        @AWKPATH=$(srcdir) $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=623485504abc2f256f51f49370f24b1e35dce1cb

commit 623485504abc2f256f51f49370f24b1e35dce1cb
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Feb 22 23:36:08 2012 +0200

    Locale fix for error message comparison.

diff --git a/test/ChangeLog b/test/ChangeLog
index 711d8b2..f5d4f39 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-22         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (beginfile2, next): Set LC_ALL=C so that error
+       messages will be in English for comparison with .ok files.
+       Thanks to Jeroen Schot <address@hidden>.
+
 2011-12-26         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (rri1): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 8d8c344..0625248 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1401,7 +1401,7 @@ beginfile1::
 
 beginfile2:
        @echo $@
-       @-( cd $(srcdir) && AWK="$(abs_builddir)/$(AWKPROG)" 
$(srcdir)/address@hidden $(srcdir)/address@hidden ) > _$@ 2>&1
+       @-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)" 
$(srcdir)/address@hidden $(srcdir)/address@hidden ) > _$@ 2>&1
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 dumpvars::
@@ -1436,7 +1436,7 @@ posix2008sub:
 next:
        @echo $@
        @-AWK="$(AWKPROG)" $(srcdir)/address@hidden > _$@ 2>&1
-       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+       @-LC_ALL=C $(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 exit:
        @echo $@
diff --git a/test/Makefile.in b/test/Makefile.in
index 33967b0..402d940 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1751,7 +1751,7 @@ beginfile1::
 
 beginfile2:
        @echo $@
-       @-( cd $(srcdir) && AWK="$(abs_builddir)/$(AWKPROG)" 
$(srcdir)/address@hidden $(srcdir)/address@hidden ) > _$@ 2>&1
+       @-( cd $(srcdir) && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)" 
$(srcdir)/address@hidden $(srcdir)/address@hidden ) > _$@ 2>&1
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 dumpvars::
@@ -1786,7 +1786,7 @@ posix2008sub:
 next:
        @echo $@
        @-AWK="$(AWKPROG)" $(srcdir)/address@hidden > _$@ 2>&1
-       @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
+       @-LC_ALL=C $(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 exit:
        @echo $@

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

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


hooks/post-receive
-- 
gawk