From 253ae96bf107ee7a834a4f07911cc84b71e76a1d Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 13 May 2021 17:52:31 +0200 Subject: [PATCH] Do not use escape codes for matching with grep FreeBSD 13.0 replaced GNU grep with BSD grep and removed support for "redundant escapes for most ordinary characters" from regex(3) library, therefore the matching sequence in digdelv/tests.sh needs to be rewritten otherwise it fails with: grep: trailing backslash (\) --- bin/tests/system/digdelv/tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index 099e08e87e..1c966cbc8b 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -975,7 +975,8 @@ if [ -x "$DIG" ] ; then echo_i "check that dig +bufsize=0 +edns sends EDNS with bufsize of 0 ($n)" ret=0 dig_with_opts @10.53.0.3 a.example +bufsize=0 +edns +qr > dig.out.test$n 2>&1 || ret=1 - grep -E 'EDNS:.* udp: 0\r{0,1}$' dig.out.test$n > /dev/null|| ret=1 + pat='EDNS:.* udp: 0$' + tr -d '\r' < dig.out.test$n | grep -E "$pat" > /dev/null || ret=1 if [ $ret -ne 0 ]; then echo_i "failed"; fi status=$((status+ret))