From: Mark Andrews <marka@isc.org>
Date: Tue, 24 Sep 2019 03:11:08 +0000 (+1000)
Subject: use test specific shell variables
X-Git-Tag: v9.14.7~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd916bf406e30d6974ee78055db8d11a590daa13;p=thirdparty%2Fbind9.git

use test specific shell variables

(cherry picked from commit 4a5400c1b70b0b95e41cb87a90b6c09bc0eebe01)
---

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 7fce73d21fb..4e63125084e 100755
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -470,19 +470,19 @@ n=`expr $n + 1`
 echo_i "check prefetch of validated DS's RRSIG TTL is updated (${n})"
 ret=0
 $DIG $DIGOPTS +dnssec @10.53.0.5 ds.example.net ds > dig.out.1.${n} || ret=1
-ttl1=`awk '$4 == "DS" && $7 == "1" { print $2 - 2 }' dig.out.1.${n}`
+dsttl1=`awk '$4 == "DS" && $7 == "1" { print $2 - 2 }' dig.out.1.${n}`
 # sleep so we are in prefetch range
-sleep ${ttl1:-0}
+sleep ${dsttl1:-0}
 # trigger prefetch
 $DIG $DIGOPTS @10.53.0.5 ds.example.net ds > dig.out.2.${n} || ret=1
-ttl1=`awk '$4 == "DS" && $7 == "1" { print $2 }' dig.out.2.${n}`
+dsttl2=`awk '$4 == "DS" && $7 == "1" { print $2 }' dig.out.2.${n}`
 sleep 1
 # check that prefetch occured
 $DIG $DIGOPTS @10.53.0.5 ds.example.net ds +dnssec > dig.out.3.${n} || ret=1
 dsttl=`awk '$4 == "DS" && $7 == "1" { print $2 }' dig.out.3.${n}`
 sigttl=`awk '$4 == "RRSIG" && $5 == "DS" { print $2 }' dig.out.3.${n}`
-test ${dsttl:-0} -gt ${ttl2:-1} || ret=1
-test ${sigttl:-0} -gt ${ttl2:-1} || ret=1
+test ${dsttl:-0} -gt ${dsttl2:-1} || ret=1
+test ${sigttl:-0} -gt ${dsttl2:-1} || ret=1
 test ${dsttl:-0} -eq ${sigttl:-1} || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`