[7/8] testsuite: use grep -E instead of egrep
Commit Message
egrep has been deprecated in favor of grep -E for a long time, and the
next grep release (3.8 or 4.0) will print a warning of egrep is used.
Stop using egrep so we won't see the warning.
gcc/testsuite/ChangeLog:
* ada/acats/run_all.sh: Use grep -E instead of egrep.
* go.test/go-test.exp: Likewise.
---
gcc/testsuite/ada/acats/run_all.sh | 2 +-
gcc/testsuite/go.test/go-test.exp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Comments
> egrep has been deprecated in favor of grep -E for a long time, and the
> next grep release (3.8 or 4.0) will print a warning of egrep is used.
> Stop using egrep so we won't see the warning.
Ada part is OK, thanks.
> gcc/testsuite/ChangeLog:
>
> * ada/acats/run_all.sh: Use grep -E instead of egrep.
> * go.test/go-test.exp: Likewise.
> ---
> gcc/testsuite/ada/acats/run_all.sh | 2 +-
> gcc/testsuite/go.test/go-test.exp | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh
> index ac2a86bea6c..a48b492711b 100755
> --- a/gcc/testsuite/ada/acats/run_all.sh
> +++ b/gcc/testsuite/ada/acats/run_all.sh
> @@ -367,7 +367,7 @@ for chapter in $chapters; do
> target_run $dir/tests/$chapter/$i/$binmain > $dir/tests/$chapter/$i/${i}.log 2>&1
> cd $dir/tests/$chapter/$i
> cat ${i}.log >> $dir/acats.log
> - egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1
> + grep -E -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1
> if [ $? -ne 0 ]; then
> grep 'tasking not implemented' ${i}.log > /dev/null 2>&1
>
> diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
> index 11c178ad7ec..5699d3d248d 100644
> --- a/gcc/testsuite/go.test/go-test.exp
> +++ b/gcc/testsuite/go.test/go-test.exp
> @@ -1207,7 +1207,7 @@ proc go-gc-tests { } {
> || $test_line == "// \$G \$D/empty.go && errchk \$G \$D/\$F.go" } {
> # These tests import the same package under two different
> # names, which gccgo does not support.
> - } elseif { $test_line == "// \$G -S \$D/\$F.go | egrep initdone >/dev/null && echo BUG sinit || true" } {
> + } elseif { $test_line == "// \$G -S \$D/\$F.go | grep -E initdone >/dev/null && echo BUG sinit || true" } {
> # This tests whether initializers are written out
> # statically. gccgo does not provide a way to test that,
> # as an initializer will be generated for any code which
> --
> 2.36.1
>
>
@@ -367,7 +367,7 @@ for chapter in $chapters; do
target_run $dir/tests/$chapter/$i/$binmain > $dir/tests/$chapter/$i/${i}.log 2>&1
cd $dir/tests/$chapter/$i
cat ${i}.log >> $dir/acats.log
- egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1
+ grep -E -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
grep 'tasking not implemented' ${i}.log > /dev/null 2>&1
@@ -1207,7 +1207,7 @@ proc go-gc-tests { } {
|| $test_line == "// \$G \$D/empty.go && errchk \$G \$D/\$F.go" } {
# These tests import the same package under two different
# names, which gccgo does not support.
- } elseif { $test_line == "// \$G -S \$D/\$F.go | egrep initdone >/dev/null && echo BUG sinit || true" } {
+ } elseif { $test_line == "// \$G -S \$D/\$F.go | grep -E initdone >/dev/null && echo BUG sinit || true" } {
# This tests whether initializers are written out
# statically. gccgo does not provide a way to test that,
# as an initializer will be generated for any code which