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

'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.

(cherry picked from commit 5beba4d292462d230a92f596c74ebbf9379c8ffe)

diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index 508e6f511da0c231ea1f8835b7192ab49824d996..ff4c16cbfb22f84de5a240b5c8b960e95e238bc8 100644 (file)
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -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))

diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 917887ebca16ca83261c6fa1d96d1a8e7d85b21c..87e4118ca327b50c309dadeebfa65aad2ac0c32d 100644 (file)
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -622,7 +622,7 @@ nochange_ns10 a3-1.static-stub-nomatch # 16
 if [ "$MODE" = dnsrps ]; then
   addr 12.12.12.12 as-ns.tld5. # 17 qname-as-ns
 fi
-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
 if [ "$MODE" = dnsrps ]; then
@@ -645,7 +645,7 @@ nochange_ns10 a4-1.static-stub-nomatch # 8
 if [ "$MODE" = dnsrps ]; then
   addr 12.12.12.12 as-ns.tld5. # 9 ip-as-ns
 fi
-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