Commit bc7b34d6 authored by Evan Hunt's avatar Evan Hunt

fix broken masterformat test

- dig command had the @ parameter in the wrong place
- private-dnskey and private-cdnskey are queried in a separate
  loop, which strips 'private-' from the name to determine the qtype
parent f13c87b8
Pipeline #8908 passed with stages
in 21 minutes and 28 seconds
...@@ -98,16 +98,21 @@ ret=0 ...@@ -98,16 +98,21 @@ ret=0
set -- 1 2 3 set -- 1 2 3
for zone in example example-explicit example-compat; do for zone in example example-explicit example-compat; do
for server in "$@"; do for server in "$@"; do
for name in ns mx a aaaa cname dname txt rrsig nsec \ for qname in ns mx a aaaa cname dname txt rrsig nsec \
dnskey ds cdnskey cds private-dnskey private-cdnskey; do dnskey ds cdnskey cds; do
dig_with_opts "$name.$zone." "$name" "@10.53.0.$server" qtype="$qname"
dig_with_opts @10.53.0.${server} -q ${qname}.${zone}. -t ${qtype}
echo echo
done > "dig.out.$zone.$server.test$n" done > dig.out.${zone}.${server}.test${n}
for qname in private-dnskey private-cdnskey; do
qtype=$(expr "$qname" : '.*-\(.*\)')
dig_with_opts @10.53.0.${server} -q ${qname}.${zone}. -t ${qtype}
done >> dig.out.${zone}.${server}.test${n}
done done
digcomp "dig.out.$zone.1.test$n" "dig.out.$zone.2.test$n" || ret=1 digcomp dig.out.${zone}.1.test${n} dig.out.${zone}.2.test${n} || ret=1
if [ "$zone" = "example" ]; then if [ "$zone" = "example" ]; then
set -- 1 2 set -- 1 2
digcomp "dig.out.$zone.1.test$n" "dig.out.$zone.3.test$n" || ret=1 digcomp dig.out.${zone}.1.test${n} dig.out.${zone}.3.test${n} || ret=1
fi fi
done done
n=$((n+1)) n=$((n+1))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment