upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 17:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

'nextpart' and 'grep -q' don't work together

Browse source 
'nextpart file | grep -q' doesn't work as expected.  'grep -q' is not
required to read all of the input and that causes 'nextpart' to fail.
This commit is contained in:
Mark Andrews 2025-10-14 16:41:50 +11:00
parent d4527cb9e6
commit 5beba4d292
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/system/addzone/tests.sh
View file

@ -763,7 +763,7 @@ echo_i "checking addzone with nonexistent template ($n)"
ret=0
nextpart ns2/named.run >/dev/null
$RNDCCMD 10.53.0.2 addzone 'wrong.example in external { template nope; };' 2>&1 | grep -qF "failure" || ret=1
nextpart ns2/named.run | grep -qF "zone 'wrong.example': template 'nope' not found" || ret=1
nextpart ns2/named.run | grep -F "zone 'wrong.example': template 'nope' not found" >/dev/null || ret=1
test -f ns2/wrong-template.example.db && ret=1
n=$((n + 1))
if [ $ret != 0 ]; then echo_i "failed"; fi

2
bin/tests/system/ixfr/tests.sh
View file

@ -243,7 +243,7 @@ $DIG $DIGOPTS test.nil. TXT @10.53.0.1 >dig.out.test$n.2 || ret=1
grep -q -F "serial 4, fallback AXFR" dig.out.test$n.2 || ret=1
# Ensure the expected error is logged.
nextpart ns1/named.run | grep -q -F "SOA name mismatch" || ret=1
nextpart ns1/named.run | grep -F "SOA name mismatch" >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))

4
bin/tests/system/rpz/tests.sh
View file

@ -562,7 +562,7 @@ nxdomain a3-1.stub # 13
nxdomain a3-1.static-stub # 14
nochange_ns10 a3-1.stub-nomatch # 15
nochange_ns10 a3-1.static-stub-nomatch # 16
nextpart ns3/named.run | grep -q "unrecognized NS rpz_rrset_find() failed: glue" \
nextpart ns3/named.run | grep -F "unrecognized NS rpz_rrset_find() failed: glue" >/dev/null \
&& setret "seen: unrecognized NS rpz_rrset_find() failed: glue"
end_group
ckstats $ns3 test3 ns3 9
@ -578,7 +578,7 @@ nxdomain a4-1.stub # 5
nxdomain a4-1.static-stub # 6
nochange_ns10 a4-1.stub-nomatch # 7
nochange_ns10 a4-1.static-stub-nomatch # 8
nextpart ns3/named.run | grep -q "unrecognized NS rpz_rrset_find() failed: glue" \
nextpart ns3/named.run | grep -F "unrecognized NS rpz_rrset_find() failed: glue" >/dev/null \
&& setret "seen: unrecognized NS rpz_rrset_find() failed: glue"
end_group