Merge branch '3220-digdelv-test-uses-address-outside-of-our-control-v9_18' into 'v9_18'

Use multiple fixed expressions for portable grep usage

See merge request isc-projects/bind9!6081
This commit is contained in:
Mark Andrews 2022-04-05 05:04:18 +00:00
commit 702ab284c7

View file

@ -1047,7 +1047,7 @@ if [ -x "$DIG" ] ; then
echo_i "check that dig tries the next server after a TCP socket connection error/timeout ($n)"
ret=0
dig_with_opts +tcp @10.53.0.99 @10.53.0.3 a.example > dig.out.test$n 2>&1 || ret=1
test $(grep "connection refused\|timed out" dig.out.test$n | wc -l) -eq 3 || ret=1
test $(grep -F -e "connection refused" -e "timed out" -e "network unreachable" dig.out.test$n | wc -l) -eq 3 || ret=1
grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))