From: Mark Andrews <marka@isc.org>
Date: Fri, 5 Feb 2016 02:53:39 +0000 (+1100)
Subject: specify what to copy
X-Git-Tag: v9.11.0a1~135
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=08913705e9bcf52a33a3c29dfb5f373e893aa329;p=thirdparty%2Fbind9.git

specify what to copy

(cherry picked from commit 88624c9c3231b24700bad25c061b478a6e7e6fc1)
---

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index adf4ed9ca0f..45c693ed6ec 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -3227,18 +3227,22 @@ $KEYGEN -q -3 remove > /dev/null
 echo > remove.db.signed
 $SIGNER -S -o remove -D -f remove.db.signed remove.db.in > signer.out.1.$n 2>&1
 )
-grep -w MX signer/remove.db.signed > /dev/null || { ret=1 ; cp signer/remove.db.signed.pre$n; }
+grep -w MX signer/remove.db.signed > /dev/null || {
+	ret=1 ; cp signer/remove.db.signed signer/remove.db.signed.pre$n;
+}
 # re-generate signed zone without MX and AAAA records at apex.
 (
 cd signer
 $SIGNER -S -o remove -D -f remove.db.signed remove2.db.in > signer.out.2.$n 2>&1
 )
-grep -w MX signer/remove.db.signed > /dev/null &&  { ret=1 ; cp signer/remove.db.signed.post$n; }
+grep -w MX signer/remove.db.signed > /dev/null &&  {
+	ret=1 ; cp signer/remove.db.signed signer/remove.db.signed.post$n;
+}
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-echo "I:check that RRSIGs are correctly removed from apex when RRset is removed  NSEC3k ($n)"
+echo "I:check that RRSIGs are correctly removed from apex when RRset is removed  NSEC3 ($n)"
 ret=0
 # generate signed zone with MX and AAAA records at apex.
 (
@@ -3246,13 +3250,17 @@ cd signer
 echo > remove.db.signed
 $SIGNER -3 - -S -o remove -D -f remove.db.signed remove.db.in > signer.out.1.$n 2>&1
 )
-grep -w MX signer/remove.db.signed > /dev/null || { ret=1 ; cp signer/remove.db.signed.pre$n; }
+grep -w MX signer/remove.db.signed > /dev/null || {
+	ret=1 ; cp signer/remove.db.signed signer/remove.db.signed.pre$n;
+}
 # re-generate signed zone without MX and AAAA records at apex.
 (
 cd signer
 $SIGNER -3 - -S -o remove -D -f remove.db.signed remove2.db.in > signer.out.2.$n 2>&1
 )
-grep -w MX signer/remove.db.signed > /dev/null &&  { ret=1 ; cp signer/remove.db.signed.post$n; }
+grep -w MX signer/remove.db.signed > /dev/null &&  {
+	ret=1 ; cp signer/remove.db.signed signer/remove.db.signed.post$n;
+}
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`