From: Michał Kępień <michal@isc.org>
Date: Tue, 30 Jul 2019 19:08:40 +0000 (+0200)
Subject: Make "digdelv" system test work with BusyBox sed
X-Git-Tag: v9.15.3~26^2~4
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=266e3ed52a4bcda2a8e7815ffbbbe166516ec194;p=thirdparty%2Fbind9.git

Make "digdelv" system test work with BusyBox sed

The BusyBox version of sed treats leading '\+' in a regular expression
to be matched as a syntax error ("Repetition not preceded by valid
expression"), which triggers false positives for the "digdelv" system
test.  Make the relevant sed invocations work portably across all sed
implementations by removing the leading backslash.
---

diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index ba476288abd..0228c77bc84 100644
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -59,8 +59,8 @@ delv_with_opts() {
 }
 
 KEYID="$(cat ns2/keyid)"
-KEYDATA="$(< ns2/keydata sed -e 's/\+/[+]/g')"
-NOSPLIT="$(< ns2/keydata sed -e 's/\+/[+]/g' -e 's/ //g')"
+KEYDATA="$(< ns2/keydata sed -e 's/+/[+]/g')"
+NOSPLIT="$(< ns2/keydata sed -e 's/+/[+]/g' -e 's/ //g')"
 
 if [ -x "$DIG" ] ; then
   n=$((n+1))