summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2022-11-25 12:10:55 -0500
committerArnold D. Robbins <arnold@skeeve.com>2022-11-25 12:10:55 -0500
commit65eb8ec32368de455f56ed4d330f5010b119aba7 (patch)
treea6dc62f02c2432ecc4c28bd8679449cdde1c2800
parent8a07bbcb311f1fe9bbe8853ae33b612c8bfa036e (diff)
downloadgawk-65eb8ec32368de455f56ed4d330f5010b119aba7.tar.gz
Switch to grep -E instead of egrep in test suite. Sigh.
-rw-r--r--pc/ChangeLog4
-rw-r--r--pc/Makefile.tst8
-rw-r--r--test/ChangeLog6
-rw-r--r--test/Makefile.am8
-rw-r--r--test/Makefile.in8
5 files changed, 22 insertions, 12 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index c5e66c59..1a84a1ae 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2022-11-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.tst: Regenerated.
+
2022-11-17 Arnold D. Robbins <arnold@skeeve.com>
* 5.2.1: Release tar ball made.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index c83ffb62..91ad0480 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -1070,7 +1070,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" | egrep -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | grep -E -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
@@ -1221,7 +1221,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" | egrep -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
then $(CMP) "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \
else $(CMP) "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi
@@ -3819,9 +3819,9 @@ diffout:
if [ "$$i" != "_*" ]; then \
echo ============== $$i ============= ; \
base=`echo $$i | sed 's/^_//'` ; \
- if echo "$$GAWK_TEST_ARGS" | egrep -e '-M|--bignum' > /dev/null && [ -r $${base}-mpfr.ok ]; then \
+ if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null && [ -r $${base}-mpfr.ok ]; then \
diff -u $${base}-mpfr.ok $$i ; \
- elif echo "$$GAWK_TEST_ARGS" | egrep -e '-M|--bignum' > /dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
+ elif echo "$$GAWK_TEST_ARGS" | grep -E -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 86c15fb1..e6269d22 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2022-11-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am: Use `grep -E' instead of egrep in some of the test
+ recipes to avoid the obnoxious warning out of GNU egrep. Thanks
+ to Tomasz Kloczko <kloczko.tomasz@gmail.com> for the report.
+
2022-11-17 Arnold D. Robbins <arnold@skeeve.com>
* 5.2.1: Release tar ball made.
diff --git a/test/Makefile.am b/test/Makefile.am
index 9c8b062e..d8d8081e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2385,7 +2385,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" | egrep -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | grep -E -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
@@ -2532,7 +2532,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" | egrep -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
then $(CMP) "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \
else $(CMP) "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi
@@ -2637,9 +2637,9 @@ diffout:
if [ "$$i" != "_*" ]; then \
echo ============== $$i ============= ; \
base=`echo $$i | sed 's/^_//'` ; \
- if echo "$$GAWK_TEST_ARGS" | egrep -e '-M|--bignum' > /dev/null && [ -r $${base}-mpfr.ok ]; then \
+ if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null && [ -r $${base}-mpfr.ok ]; then \
diff -u $${base}-mpfr.ok $$i ; \
- elif echo "$$GAWK_TEST_ARGS" | egrep -e '-M|--bignum' > /dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
+ elif echo "$$GAWK_TEST_ARGS" | grep -E -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 3df8fab9..1d116637 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2839,7 +2839,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" | egrep -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | grep -E -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
@@ -2984,7 +2984,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" | egrep -e '-M|--bignum' > /dev/null; \
+ @-if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null; \
then $(CMP) "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \
else $(CMP) "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi
@@ -5561,9 +5561,9 @@ diffout:
if [ "$$i" != "_*" ]; then \
echo ============== $$i ============= ; \
base=`echo $$i | sed 's/^_//'` ; \
- if echo "$$GAWK_TEST_ARGS" | egrep -e '-M|--bignum' > /dev/null && [ -r $${base}-mpfr.ok ]; then \
+ if echo "$$GAWK_TEST_ARGS" | grep -E -e '-M|--bignum' > /dev/null && [ -r $${base}-mpfr.ok ]; then \
diff -u $${base}-mpfr.ok $$i ; \
- elif echo "$$GAWK_TEST_ARGS" | egrep -e '-M|--bignum' > /dev/null && [ -r "$(srcdir)"/$${base}-mpfr.ok ]; then \
+ elif echo "$$GAWK_TEST_ARGS" | grep -E -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 ; \