[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, porting, updated. gawk-4.1.0-5252-gdf9114b2
|
From: |
Arnold Robbins |
|
Subject: |
[SCM] gawk branch, porting, updated. gawk-4.1.0-5252-gdf9114b2 |
|
Date: |
Mon, 8 Aug 2022 09:35:49 -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, porting has been updated
via df9114b221d21ef0851e9d8ca4050ac64bad4686 (commit)
via a245edf421593a1ef994975cc32fc469089b7e08 (commit)
via ab1fc644ceabe10b7bf979b683c07c304faa487d (commit)
via c1de10ee6594d8e22168cb0ca9783eda422d59ba (commit)
from 6a62b229a849b1eb6bfba7fe4585a5a89ecb717a (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=df9114b221d21ef0851e9d8ca4050ac64bad4686
commit df9114b221d21ef0851e9d8ca4050ac64bad4686
Merge: 6a62b229 a245edf4
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Mon Aug 8 16:34:54 2022 +0300
Merge branch 'master' into porting
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=a245edf421593a1ef994975cc32fc469089b7e08
commit a245edf421593a1ef994975cc32fc469089b7e08
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Mon Aug 8 16:33:49 2022 +0300
Fix nsidentifier test for MinGW.
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 1bbe82bc..a135c4c9 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-08 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.tst.prologue (SORT2): New variable.
+ * Makefile.tst: Regenerated.
+
2022-08-08 Eli Zaretskii <eliz@gnu.org>
* gawkmisc.pc (setenv, unsetenv): Add comment about usage in
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 5c24843c..9c59aba4 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -113,6 +113,7 @@ DATE = gdate
# Set sort command
SORT = sort
+SORT2 = sort
# MS-DOS and OS/2 use ; as a PATH delimiter
PATH_SEPARATOR = ;
@@ -317,10 +318,10 @@ NEED_LOCALE_RU = mtchi18n
# List of tests that fail on MinGW
EXPECTED_FAIL_MINGW = \
- backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 \
+ backbigs1 backsmalls1 clos1way6 close_status devfd devfd1 devfd2 \
errno exitval2 fork fork2 fts functab5 \
getfile getlnhd ignrcas3 inetdayt inetecht inf-nan-torture \
- mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 \
+ iolint mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 \
pid pipeio2 pty1 pty2 readdir rstest4 rstest5 status-close timeout
@@ -1258,6 +1259,11 @@ longwrds:
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v SORT="$(SORT)" <
"$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+nsidentifier:
+ @echo $@
+ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v SORT="$(SORT2)" >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
spacere:
@echo $@
@-LC_ALL=C AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT
CODE: $$? >>_$@
@@ -3134,12 +3140,6 @@ nsfuncrecurse:
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-nsidentifier:
- @echo $@
- @echo Expect $@ to fail with MinGW.
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
nsindirect1:
@echo $@
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
diff --git a/pc/Makefile.tst.prologue b/pc/Makefile.tst.prologue
index 664c9134..95ab6ccb 100644
--- a/pc/Makefile.tst.prologue
+++ b/pc/Makefile.tst.prologue
@@ -113,6 +113,7 @@ DATE = gdate
# Set sort command
SORT = sort
+SORT2 = sort
# MS-DOS and OS/2 use ; as a PATH delimiter
PATH_SEPARATOR = ;
diff --git a/test/ChangeLog b/test/ChangeLog
index 403a9fda..626da0ee 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,13 @@
+2022-08-08 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (EXPECTED_FAIL_MINGW): Remove nsidentifier from the
+ list.
+ (SORT2): New variable, adds LC_ALL=C to sort command.
+ (nsidentifier): Set SORT variable to $(SORT2) in test.
+ * nsidentifier.awk: Use SORT command line variable for sort command,
+ set it to default if not supplied.
+ * nsidentifier.ok: Adjusted after test change.
+
2022-08-07 Eli Zaretskii <eliz@gnu.org>
* Makefile.am (EXPECTED_FAIL_MINGW): Add 3 failing tests.
diff --git a/test/Makefile.am b/test/Makefile.am
index 72adc09b..acd3632a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1605,7 +1605,7 @@ EXPECTED_FAIL_MINGW = \
backbigs1 backsmalls1 clos1way6 close_status devfd devfd1 devfd2 \
errno exitval2 fork fork2 fts functab5 \
getfile getlnhd ignrcas3 inetdayt inetecht inf-nan-torture \
- iolint mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 nsidentifier \
+ iolint mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 \
pid pipeio2 pty1 pty2 readdir rstest4 rstest5 status-close timeout
# List of tests that fail on z/OS
@@ -1636,6 +1636,7 @@ NEED_TESTOUTCMP = \
CMP = cmp
AWKPROG = ../gawk$(EXEEXT)
SORT = sort
+SORT2 = LC_ALL=C sort
# Default for VALGRIND is empty unless overridden by a command-line argument.
# This protects against cruft in the environment.
@@ -2545,12 +2546,15 @@ nlstringtest::
$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \
fi
-
longwrds:
@echo $@
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v SORT="$(SORT)" <
"$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+nsidentifier:
+ @echo $@
+ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v SORT="$(SORT2)" >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
spacere:
@echo $@
diff --git a/test/Makefile.in b/test/Makefile.in
index c19017e2..78eb0e7b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1869,10 +1869,10 @@ NEED_LOCALE_RU = mtchi18n
# List of tests that fail on MinGW
EXPECTED_FAIL_MINGW = \
- backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 \
+ backbigs1 backsmalls1 clos1way6 close_status devfd devfd1 devfd2 \
errno exitval2 fork fork2 fts functab5 \
getfile getlnhd ignrcas3 inetdayt inetecht inf-nan-torture \
- mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 \
+ iolint mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 \
pid pipeio2 pty1 pty2 readdir rstest4 rstest5 status-close timeout
@@ -1904,6 +1904,7 @@ NEED_TESTOUTCMP = \
CMP = cmp
AWKPROG = ../gawk$(EXEEXT)
SORT = sort
+SORT2 = LC_ALL=C sort
# Default for VALGRIND is empty unless overridden by a command-line argument.
# This protects against cruft in the environment.
@@ -3000,6 +3001,11 @@ longwrds:
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v SORT="$(SORT)" <
"$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+nsidentifier:
+ @echo $@
+ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v SORT="$(SORT2)" >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
spacere:
@echo $@
@-LC_ALL=C AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT
CODE: $$? >>_$@
@@ -4865,11 +4871,6 @@ nsfuncrecurse:
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-nsidentifier:
- @echo $@
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
nsindirect1:
@echo $@
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 79db8c6b..1bee55b4 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1835,11 +1835,6 @@ nsfuncrecurse:
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-nsidentifier:
- @echo $@
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
nsindirect1:
@echo $@
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE:
$$? >>_$@
diff --git a/test/nsidentifier.awk b/test/nsidentifier.awk
index 0c665289..ac8d1a9a 100644
--- a/test/nsidentifier.awk
+++ b/test/nsidentifier.awk
@@ -1,3 +1,8 @@
+# Invoker can customize sort command if necessary.
+BEGIN {
+ if (!SORT) SORT = "LC_ALL=C sort"
+}
+
# Overdocumented Test Case for FUNCTAB
@namespace "ns"
@@ -29,8 +34,8 @@ BEGIN {
}
print "------------------------------"
for (i in PROCINFO["identifiers"])
- print i | "LC_ALL=C sort"
- close("LC_ALL=C sort")
+ print i | awk::SORT
+ close(awk::SORT)
exit 0
}
diff --git a/test/nsidentifier.ok b/test/nsidentifier.ok
index 5bd7e7b2..bbe55857 100644
--- a/test/nsidentifier.ok
+++ b/test/nsidentifier.ok
@@ -61,6 +61,7 @@ ROUNDMODE
RS
RSTART
RT
+SORT
SUBSEP
SYMTAB
TEXTDOMAIN
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 ++++
README_d/README.pc | 4 +--
awk.h | 2 +-
builtin.c | 4 +--
eval.c | 2 +-
gawkapi.c | 20 +++++------
node.c | 2 +-
nonposix.h | 2 ++
pc/ChangeLog | 20 +++++++++++
pc/Makefile | 2 +-
pc/Makefile.tst | 17 ++++++----
pc/Makefile.tst.prologue | 1 +
pc/config.h | 2 +-
pc/config.sed | 1 +
pc/gawkmisc.pc | 87 +++++++++++++++++-------------------------------
test/ChangeLog | 14 ++++++++
test/Makefile.am | 10 ++++--
test/Makefile.in | 15 +++++----
test/Maketests | 5 ---
test/nsidentifier.awk | 9 +++--
test/nsidentifier.ok | 1 +
21 files changed, 128 insertions(+), 99 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, porting, updated. gawk-4.1.0-5252-gdf9114b2,
Arnold Robbins <=