gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4238-g8e6d342


From: Eli Zaretskii
Subject: [SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4238-g8e6d342
Date: Sun, 9 May 2021 05:41:13 -0400 (EDT)

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.1-stable has been updated
       via  8e6d342a0631e5514d899231ac90648d446b2ade (commit)
      from  2cc075b59f843485510d00ce4ffb3654d5a908e8 (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=8e6d342a0631e5514d899231ac90648d446b2ade

commit 8e6d342a0631e5514d899231ac90648d446b2ade
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun May 9 12:40:41 2021 +0300

    Fix test suite for MinGW.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 10327b1..bf60f21 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,5 +1,11 @@
 2021-05-09  Eli Zaretskii  <eliz@gnu.org>
 
+       * Makefile.tst (testext): Use $(CMP), not a literal "cmp", so that
+       end-of-line differences could be ignored on MS-DOS/Windows.
+       (argcasfile): Use ' /no/such/file', with a leading space, to avoid
+       MinGW thinking it's a file name, and converting it to C:\foo\bar.
+       test/argcasfile.ok adjusted accordingly.
+
        * Makefile (VPATH): Adapt to addition of support/malloc
        directory.
        (DYNOBJS): New list with dependencies of new files in
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index d37233b..b5197f2 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -1037,8 +1037,8 @@ testext::
        @$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > 
testext.awk
        @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \
-       then cmp "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk 
testexttmp.txt ; \
-       else cmp "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt 
; fi
+       then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk 
testexttmp.txt ; \
+       else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk 
testexttmp.txt ; fi
 
 getfile:
        @echo $@
@@ -1244,7 +1244,7 @@ iolint:
 
 argcasfile:
        @echo $@
-       @$(AWK) -f "$(srcdir)"/$@.awk ARGC=1 /no/such/file < "$(srcdir)/$@.in" 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @$(AWK) -f "$(srcdir)"/$@.awk ARGC=1 ' /no/such/file' < 
"$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
diff --git a/test/ChangeLog b/test/ChangeLog
index f22250d..dff7a55 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2021-05-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.am (EXPECTED_FAIL_MINGW): Update for the new tests.
+
+       * argcasfile.ok: Adjust for the leading space in the argument; see
+       pc/ChangeLog for explanation why.
+
 2021-05-08         Arnold D. Robbins     <arnold@skeeve.com>
 
        * iolint.awk: Use cksum instead of md5sum, for better portability.
diff --git a/test/Makefile.am b/test/Makefile.am
index 88d4bcd..441e701 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1570,9 +1570,10 @@ EXPECTED_FAIL_DJGPP = \
 # List of tests that fail on MinGW
 EXPECTED_FAIL_MINGW = \
        backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 \
-       errno exitval2 fork fork2 fts getfile getlnhd ignrcas3 inetdayt \
-       inetecht mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 pid pipeio2 \
-       pty1 pty2 readdir rstest4 rstest5 status-close timeout
+       errno exitval2 fmttest fork fork2 fts functab5 \
+       getfile getlnhd hsprint ignrcas3 inetdayt inetecht inf-nan-torture \
+       mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 \
+       pid pipeio2 pty1 pty2 readdir rstest4 rstest5 status-close timeout
 
 # List of tests that fail on z/OS
 EXPECTED_FAIL_ZOS = \
diff --git a/test/argcasfile.ok b/test/argcasfile.ok
index 8b5d35b..bdb6918 100644
--- a/test/argcasfile.ok
+++ b/test/argcasfile.ok
@@ -1,9 +1,9 @@
 0 gawk
 1 ARGC=1
-2 /no/such/file
+2  /no/such/file
 0 gawk
 1 ARGC=1
-2 /no/such/file
+2  /no/such/file
 0 gawk
 1 ARGC=1
-2 /no/such/file
+2  /no/such/file

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

Summary of changes:
 pc/ChangeLog       | 6 ++++++
 pc/Makefile.tst    | 6 +++---
 test/ChangeLog     | 7 +++++++
 test/Makefile.am   | 7 ++++---
 test/argcasfile.ok | 6 +++---
 5 files changed, 23 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]