[SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5503-gf338a3e9

[Eli Zaretskii]

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-5.3-stable has been updated
       via  f338a3e9adb10aee7ff5cb883a68e6618deeecf1 (commit)
      from  cd37f849c3943a1fb621d69973ec24921ad49343 (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=f338a3e9adb10aee7ff5cb883a68e6618deeecf1

commit f338a3e9adb10aee7ff5cb883a68e6618deeecf1
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Aug 11 15:49:38 2024 +0300

    Fix printf-corners test in the MinGW build.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 8e2f344a..bb0248fc 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,5 +1,10 @@
 2024-08-11  Eli Zaretskii  <eliz@gnu.org>
 
+       * Makefile.tst (NEED_TESTOUTCMP, printf-corners): Use
+       testoutcmp.awk.
+
+       * testoutcmp.awk: Add fixes for NAN and INF; fix exponents.
+
        * Makefile (AWKOBJS4): Add new file printf$O.
 
 2024-08-09         Arnold D. Robbins     <arnold@skeeve.com>
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 7d4cd4b4..d6d0d81c 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -357,7 +357,7 @@ GENTESTS_UNUSED = Makefile.in checknegtime.awk dtdgport.awk 
fix-fmtspcl.awk \
 
 # List of tests on MinGW that need a different cmp program
 NEED_TESTOUTCMP = \
-       beginfile2 double2 exit fmttest hsprint posix profile5 space
+       beginfile2 double2 exit fmttest hsprint posix profile5 space 
printf-corners
 
 
 
@@ -2617,8 +2617,8 @@ printf-corners:
        @echo $@
        @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: 
$$? >>_$@
        @-if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' > /dev/null ; \
-       then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
-       else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
+       then $(TESTOUTCMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+       else $(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
 
 widesub4:
        @echo $@ $(ZOS_FAIL)
diff --git a/pc/testoutcmp.awk b/pc/testoutcmp.awk
index d4bbadd0..4aad0305 100644
--- a/pc/testoutcmp.awk
+++ b/pc/testoutcmp.awk
@@ -50,19 +50,26 @@ END {
                        continue
 
                # For exponents
-               actual1 = gensub(/( ?)([-+]?[0-9.][0-9.]?+e[-+])0([0-9][0-9])/, 
" \\1\\2\\3", "g", actual)
+               actual1 = gensub(/([ 
<]?)([-+]?[0-9.][0-9.]?+[eE][-+])0([0-9][0-9])/, " \\1\\2\\3", "g", actual)
                if (good == actual1)
                    continue
-               actual1 = gensub(/([-+]?0)([0-9.]+e[-+])0([0-9][0-9])/, 
"\\10\\2\\3", "g", actual)
+               actual1 = gensub(/([-+]?0)([0-9.]+[eE][-+])0([0-9][0-9])/, 
"\\10\\2\\3", "g", actual)
                if (good == actual1)
                    continue
-               actual1 = gensub(/( 
?)([-+]?)([1-9.][0-9.]?+e[-+])0([0-9][0-9])/, "\\1\\20\\3\\4", "g", actual)
+               actual1 = gensub(/( 
?)([-+]?)([1-9.][0-9.]?+[eE][-+])0([0-9][0-9])/, "\\1\\20\\3\\4", "g", actual)
                if (good == actual1)
                    continue
-               actual1 = gensub(/([-+]?[0-9.]+e[-+])0([0-9][0-9])/, "\\1\\2 ", 
"g", actual)
+               actual1 = gensub(/([-+]?[0-9.]+[eE][-+])0([0-9][0-9])/, "\\1\\2 
", "g", actual)
                if (good == actual1)
                    continue
-               actual1 = gensub(/([-+]?[0-9.]+e[-+])0([0-9][0-9])/, "\\1\\2", 
"g", actual)
+               actual1 = gensub(/([-+]?[0-9.]+[eE][-+])0([0-9][0-9])/, 
"\\1\\2", "g", actual)
+               if (good == actual1)
+                   continue
+               # For NaN and Inf
+               actual1 = gensub(/([< \t])([-+])nan/, "\\1\\2NAN", "g", actual)
+               if (good == actual1)
+                   continue
+               actual1 = gensub(/([< \t])([-+])inf/, "\\1\\2INF", "g", actual)
                if (good == actual1)
                    continue
                # For exit test
diff --git a/test/ChangeLog b/test/ChangeLog
index 59c2e8c1..7c0f50c0 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2024-08-11  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.am (NEED_TESTOUTCMP): Add printf-corners.
+
 2024-08-09         Arnold D. Robbins     <arnold@skeeve.com>
 
        * Makefile.am (colonwarn): Fix to use AWKPATH.
diff --git a/test/Makefile.am b/test/Makefile.am
index 335e8d34..9237e369 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1728,7 +1728,7 @@ GENTESTS_UNUSED = Makefile.in checknegtime.awk 
dtdgport.awk fix-fmtspcl.awk \
 
 # List of tests on MinGW that need a different cmp program
 NEED_TESTOUTCMP = \
-       beginfile2 double2 exit fmttest hsprint posix profile5 space
+       beginfile2 double2 exit fmttest hsprint posix profile5 space 
printf-corners
 
 CMP = cmp
 AWKPROG = ../gawk$(EXEEXT)

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

Summary of changes:
 pc/ChangeLog      |  5 +++++
 pc/Makefile.tst   |  6 +++---
 pc/testoutcmp.awk | 17 ++++++++++++-----
 test/ChangeLog    |  4 ++++
 test/Makefile.am  |  2 +-
 5 files changed, 25 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
gawk