diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2022-11-25 12:11:44 -0500 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2022-11-25 12:11:44 -0500 |
| commit | c3640afd6f6e635115363cacd26cd7a36e5f4177 (patch) | |
| tree | 3f2eb5b4694e4d2eb899d58510a674418dcae40d /test | |
| parent | 8135130eedebb50929001e4dfe57576b67022253 (diff) | |
| parent | 65eb8ec32368de455f56ed4d330f5010b119aba7 (diff) | |
| download | gawk-c3640afd6f6e635115363cacd26cd7a36e5f4177.tar.gz | |
Merge branch 'gawk-5.2-stable'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 8 | ||||
| -rw-r--r-- | test/Makefile.in | 8 |
3 files changed, 14 insertions, 8 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 7b660548..8ea42359 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 3a0ae9e7..12046956 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2388,7 +2388,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 @@ -2535,7 +2535,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 @@ -2640,9 +2640,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 1cf02705..ffefaad6 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2842,7 +2842,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 @@ -2987,7 +2987,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 @@ -5569,9 +5569,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 ; \ |