[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4249-ge07a536
From: |
Eli Zaretskii |
Subject: |
[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4249-ge07a536 |
Date: |
Sat, 15 May 2021 03:00:07 -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 e07a536ce04c70c472f962c985e741025f67a292 (commit)
from 9f4d21a8c8e78f223f993139a857fccd0bc30a29 (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=e07a536ce04c70c472f962c985e741025f67a292
commit e07a536ce04c70c472f962c985e741025f67a292
Author: Eli Zaretskii <eliz@gnu.org>
Date: Sat May 15 09:59:23 2021 +0300
Fix DEFPATH and iolint test in MinGW build.
diff --git a/pc/Makefile b/pc/Makefile
index 0dc8bb4..1055a98 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -85,6 +85,7 @@ MAK = $(MAKE) $(MAKEFILE)
prefix = c:/gnu
pkgdatadir = $(prefix)/lib/awk
pkgextensiondir = $(prefix)/lib/gawk
+DEFPATH = "\".;$(pkgdatadir);c:/lib/awk;c:/gnu/lib/awk\""
DEFLIBPATH = "\"$(pkgextensiondir)\""
LOCALEDIR="\"$(prefix)/share/locale\""
SHLIBEXT = "\"dll\""
@@ -228,7 +229,7 @@ BIND = EMPTY
PBIND = EMPTY
EMPTY=
-CFLAGS = $(CF) -DGAWK -I. -I./support -DHAVE_CONFIG_H
-DDEFLIBPATH=$(DEFLIBPATH) -DSHLIBEXT=$(SHLIBEXT) -DLOCALEDIR=$(LOCALEDIR)
+CFLAGS = $(CF) -DGAWK -I. -I./support -DHAVE_CONFIG_H -DDEFPATH=$(DEFPATH)
-DDEFLIBPATH=$(DEFLIBPATH) -DSHLIBEXT=$(SHLIBEXT) -DLOCALEDIR=$(LOCALEDIR)
# object files
AWKOBJS1 = array$O builtin$O eval$O field$O floatcomp$O gawkmisc$O io$O main$O
diff --git a/test/ChangeLog b/test/ChangeLog
index d43ba1b..c92f018 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2021-05-15 Eli Zaretskii <eliz@gnu.org>
+
+ * iolint.ok: Reorder results to follow the order of iolint.awk.
+
+ * iolint.awk: Use "BINMODE = 2", otherwise the result of cksum on
+ non-Posix platforms will not match. Reorder the tests to make the
+ binary mode used only in the last one.
+
2021-05-13 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (EXPECTED_FAIL_ZOS): Updated and sorted / uniqued.
diff --git a/test/iolint.awk b/test/iolint.awk
index a866ed6..257678e 100644
--- a/test/iolint.awk
+++ b/test/iolint.awk
@@ -37,13 +37,6 @@ BEGIN {
print close("f2") # -1 expected here
fflush()
- # `%.*s' used for output file and output pipe"
- print "junk" > "cksum" # cksum is more portable than md5sum
- print "hello" | "cksum"
- print close("cksum")
- print close("cksum")
- fflush()
-
# `%.*s' used for input pipe and output file
"echo hello" | getline junk
print "hello" > "echo hello"
@@ -68,4 +61,12 @@ BEGIN {
print close("echo hello")
print close("echo hello")
fflush()
+
+ # `%.*s' used for output file and output pipe"
+ BINMODE = 2
+ print "junk" > "cksum" # cksum is more portable than md5sum
+ print "hello" | "cksum"
+ print close("cksum")
+ print close("cksum")
+ fflush()
}
diff --git a/test/iolint.ok b/test/iolint.ok
index 0008b0a..fbf514c 100644
--- a/test/iolint.ok
+++ b/test/iolint.ok
@@ -16,18 +16,18 @@ gawk: iolint.awk:35: warning: unnecessary mixing of `>' and
`>>' for file `f2'
0
gawk: iolint.awk:37: warning: close: `f2' is not an open file, pipe or
co-process
-1
-gawk: iolint.awk:42: warning: `cksum' used for output file and output pipe
-3015617425 6
-0
-0
-gawk: iolint.awk:49: warning: `echo hello' used for input pipe and output file
+gawk: iolint.awk:42: warning: `echo hello' used for input pipe and output file
0
0
-gawk: iolint.awk:60: warning: `cat' used for output file and output pipe
+gawk: iolint.awk:53: warning: `cat' used for output file and output pipe
0
hello
0
-gawk: iolint.awk:67: warning: `echo hello' used for input pipe and output pipe
+gawk: iolint.awk:60: warning: `echo hello' used for input pipe and output pipe
hello
0
0
+gawk: iolint.awk:68: warning: `cksum' used for output file and output pipe
+3015617425 6
+0
+0
-----------------------------------------------------------------------
Summary of changes:
pc/Makefile | 3 ++-
test/ChangeLog | 8 ++++++++
test/iolint.awk | 15 ++++++++-------
test/iolint.ok | 14 +++++++-------
4 files changed, 25 insertions(+), 15 deletions(-)
hooks/post-receive
--
gawk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4249-ge07a536,
Eli Zaretskii <=