[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5479-g1295eb8e
|
From: |
Arnold Robbins |
|
Subject: |
[SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5479-g1295eb8e |
|
Date: |
Sat, 8 Jun 2024 15:57:05 -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.3-stable has been updated
via 1295eb8e28b7b29a8659934e48bfb5bec9a07ab4 (commit)
from 6be74eac7683c47e48363dbc74fac42c36a4e6fd (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=1295eb8e28b7b29a8659934e48bfb5bec9a07ab4
commit 1295eb8e28b7b29a8659934e48bfb5bec9a07ab4
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Sat Jun 8 22:56:35 2024 +0300
Further fixes grep -> egrep.
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 7f52ad33..9e63f7f1 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2024-06-08 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.tst: Regenerated.
+
2024-04-20 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.tst: Regenerated.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 7c5a8f0f..982b1bbf 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -1076,7 +1076,7 @@ testext::
@echo $@
@-$(AWK) ' /^(@load|BEGIN|function)/,/^}/'
"$(top_srcdir)"/extension/testext.c > testext.awk
@-$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' > /dev/null; \
then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; \
else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; fi
@@ -1231,7 +1231,7 @@ ignrcas3::
arrdbg:
@echo $@
@-$(AWK) -v "okfile=./$@.ok" -v "mpfr_okfile=./$@-mpfr.ok" -f
"$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' > /dev/null; \
then $(CMP) "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \
else $(CMP) "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi
@@ -3970,9 +3970,9 @@ diffout:
if [ "$$i" != "_*" ]; then \
echo ============== $$i ============= ; \
base=`echo $$i | sed 's/^_//'` ; \
- if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' >
/dev/null && [ -r $${base}-mpfr.ok ]; then \
+ if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' >
/dev/null && [ -r $${base}-mpfr.ok ]; then \
diff -u $${base}-mpfr.ok $$i ; \
- elif echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' >
/dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
+ elif echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' >
/dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
diff -u "$(srcdir)"/$${base}-mpfr.ok $$i ; \
elif [ -r $${base}.ok ]; then \
diff -u $${base}.ok $$i ; \
diff --git a/test/ChangeLog b/test/ChangeLog
index 1ad961ec..004b5c11 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,7 +1,9 @@
2024-06-08 Arnold D. Robbins <arnold@skeeve.com>
* Gentests: Change `egrep -q' to `egrep -s' for greater portability.
- Thanks to Nelson Beebe for the report.
+ * Makefile.am: Change uses of `grep -E' to `egrep -s' for
+ more portability.
+ Thanks to Nelson Beebe for the reports.
2024-05-19 Arnold D. Robbins <arnold@skeeve.com>
diff --git a/test/Makefile.am b/test/Makefile.am
index 6af8e87e..a847c02c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2455,7 +2455,7 @@ testext::
@echo $@
@-$(AWK) ' /^(@load|BEGIN|function)/,/^}/'
"$(top_srcdir)"/extension/testext.c > testext.awk
@-$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' > /dev/null; \
then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; \
else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; fi
@@ -2606,7 +2606,7 @@ ignrcas3::
arrdbg:
@echo $@
@-$(AWK) -v "okfile=./$@.ok" -v "mpfr_okfile=./$@-mpfr.ok" -f
"$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' > /dev/null; \
then $(CMP) "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \
else $(CMP) "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi
@@ -2711,9 +2711,9 @@ diffout:
if [ "$$i" != "_*" ]; then \
echo ============== $$i ============= ; \
base=`echo $$i | sed 's/^_//'` ; \
- if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' >
/dev/null && [ -r $${base}-mpfr.ok ]; then \
+ if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' >
/dev/null && [ -r $${base}-mpfr.ok ]; then \
diff -u $${base}-mpfr.ok $$i ; \
- elif echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' >
/dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
+ elif echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' >
/dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
diff -u "$(srcdir)"/$${base}-mpfr.ok $$i ; \
elif [ -r $${base}.ok ]; then \
diff -u $${base}.ok $$i ; \
diff --git a/test/Makefile.in b/test/Makefile.in
index ae59b1d4..f6546082 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2905,7 +2905,7 @@ testext::
@echo $@
@-$(AWK) ' /^(@load|BEGIN|function)/,/^}/'
"$(top_srcdir)"/extension/testext.c > testext.awk
@-$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' > /dev/null; \
then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; \
else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; fi
@@ -3054,7 +3054,7 @@ ignrcas3::
arrdbg:
@echo $@
@-$(AWK) -v "okfile=./$@.ok" -v "mpfr_okfile=./$@-mpfr.ok" -f
"$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' > /dev/null; \
then $(CMP) "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \
else $(CMP) "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi
@@ -5769,9 +5769,9 @@ diffout:
if [ "$$i" != "_*" ]; then \
echo ============== $$i ============= ; \
base=`echo $$i | sed 's/^_//'` ; \
- if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' >
/dev/null && [ -r $${base}-mpfr.ok ]; then \
+ if echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' >
/dev/null && [ -r $${base}-mpfr.ok ]; then \
diff -u $${base}-mpfr.ok $$i ; \
- elif echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' >
/dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
+ elif echo "$$GAWK_TEST_ARGS" | egrep -s -e '-M|--bignum' >
/dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
diff -u "$(srcdir)"/$${base}-mpfr.ok $$i ; \
elif [ -r $${base}.ok ]; then \
diff -u $${base}.ok $$i ; \
-----------------------------------------------------------------------
Summary of changes:
pc/ChangeLog | 4 ++++
pc/Makefile.tst | 8 ++++----
test/ChangeLog | 4 +++-
test/Makefile.am | 8 ++++----
test/Makefile.in | 8 ++++----
5 files changed, 19 insertions(+), 13 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5479-g1295eb8e,
Arnold Robbins <=