do not overflow exit status. [RT #42643]

diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
index 27efd5cde8daa2808f3b3b8a097a16e5a63fbec0..7db3e3eb7156bed7e1823460a7e32f65d7297f28 100644 (file)
--- a/bin/tests/system/acl/tests.sh
+++ b/bin/tests/system/acl/tests.sh
@@ -181,4 +181,4 @@ $DIG example. soa @10.53.0.2 +subnet="192.0.2.128/32" -p 5300 > dig.out.${t}
 grep "CLIENT-SUBNET.*192.0.2.128/32/24" dig.out.${t} > /dev/null || { echo "I:test $t failed" ; status=1; }
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index 02210805962d88f9367060c692220f9a71e05f98..65ea9bc49718b1426811174130886ce945a8fac9 100644 (file)
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -139,4 +139,5 @@ if [ $ret -eq 1 ] ; then
     echo "I: failed"; status=1
 fi
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index 528cf3337595f39803c779074faafaf3ea4674a4..1a2a8ee3dddbcca812fc6408f061f7adfeb89228 100755 (executable)
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -381,4 +381,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/allow_query/tests.sh b/bin/tests/system/allow_query/tests.sh
index 0592c342d4624d40c22e4a03e78c3fca17e2d463..afb630f37c699113d0c02db82175659996a0e42e 100644 (file)
--- a/bin/tests/system/allow_query/tests.sh
+++ b/bin/tests/system/allow_query/tests.sh
@@ -630,5 +630,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
-
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 6a3a50a769f0ba9314451a76ca29ab04968910e6..15e26b3e1ca728724cc9b270a3239c509ff28626 100644 (file)
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -1217,4 +1217,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh
index b51cf450f26e553f3ae1d350d5a980eb2c2ea64a..8c1aea39901f23519476c468b1ecd18908dcbf1c 100644 (file)
--- a/bin/tests/system/builtin/tests.sh
+++ b/bin/tests/system/builtin/tests.sh
@@ -123,4 +123,5 @@ $DIG +norec +nsid foo @10.53.0.3 -p 5300 > dig.out.ns3.$n
 grep "^; NSID: .* (\"this.is.a.test.of.server-id\")$" dig.out.ns3.$n > /dev/null || ret=1
 if [ $ret != 0 ] ; then echo I:failed; status=`expr $status + $ret`; fi
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index 539550fd99669e496dcdcc756328b1786b4a21ad..7c0dbe0b7c4ccc13992f5ddae9f7d088aa266a7f 100644 (file)
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -225,4 +225,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/case/tests.sh b/bin/tests/system/case/tests.sh
index 54ffd9e124cd994f72f27af974aa943764bdb1a2..6cd3d7f87914ccd9b6121af270ef9129dc4ce676 100644 (file)
--- a/bin/tests/system/case/tests.sh
+++ b/bin/tests/system/case/tests.sh
@@ -137,5 +137,7 @@ echo "I:check A owner case is transfered to slave ($n)"
 ret=0
 $DIG axfr dynamic @10.53.0.2 -p 5300 > dig.ns2.test$n
 $PERL ../digcomp.pl dig.ns2.test$n postns1.good || ret=1
+status=`expr $status + $ret`
+
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index 3ea927c52ffa7228bd238661c92e2459176d690a..54a86342714e995fc9d40b13eb48038dff21a602 100644 (file)
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -373,4 +373,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index a04601a689baf23a78e08e06a5a3ab7c3a353246..dcc57a5c9361c5188f53f906e51a16f576d2fee2 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -293,4 +293,4 @@ if [ $ret != 0 ]; then echo "I:failed"; ret=1; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/checkds/tests.sh b/bin/tests/system/checkds/tests.sh
index 5fb1f65b459ce5d70d8a140404cf49f91125f9d7..f6ab8fbc34b66b15a5331829a71d4c8e6780160d 100644 (file)
--- a/bin/tests/system/checkds/tests.sh
+++ b/bin/tests/system/checkds/tests.sh
@@ -176,4 +176,4 @@ status=`expr $status + $ret`
 
 if [ $status = 0 ]; then $SHELL clean.sh; fi
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/checknames/tests.sh b/bin/tests/system/checknames/tests.sh
index 1480442f6ea9d6dfa14d13ab244381a14bf09878..0abea09fc03338f4706b0278c6b64246fe8eaa8e 100644 (file)
--- a/bin/tests/system/checknames/tests.sh
+++ b/bin/tests/system/checknames/tests.sh
@@ -151,4 +151,5 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 n=`expr $n + 1`
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
index d5a04d2c4aee5ef003b2f10e4b9a38bc011ad36c..f391aff631ac935dcfabc2212fec57f7c3744ea4 100644 (file)
--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@@ -171,4 +171,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh
index 10f4198fd7c331b324bd41f9597c21cfcacc0145..f28f3775e483fa067606439815be5bc019a1ed88 100755 (executable)
--- a/bin/tests/system/cookie/tests.sh
+++ b/bin/tests/system/cookie/tests.sh
@@ -137,4 +137,4 @@ status=`expr $status + $ret`
 
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/coverage/tests.sh b/bin/tests/system/coverage/tests.sh
index 099bdefabd09c174c02e302cb2ba8c8fbbae9d93..228ab8aacb6195b9a7606ee04e39d697dcc21414 100644 (file)
--- a/bin/tests/system/coverage/tests.sh
+++ b/bin/tests/system/coverage/tests.sh
@@ -81,4 +81,4 @@ for dir in [0-9][0-9]-*; do
 done
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh
index 85406172604600815e907f689ecd9f52925ffae6..bec9112c5ea588e3e0cba51ccc1e39ff241f8f07 100644 (file)
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@@ -57,4 +57,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dialup/tests.sh b/bin/tests/system/dialup/tests.sh
index 40da054227188db1dfa97e27e69db93112b56ad9..bcbc71873a4231c13a1e4d405a4e02e84b2c8af7 100644 (file)
--- a/bin/tests/system/dialup/tests.sh
+++ b/bin/tests/system/dialup/tests.sh
@@ -68,4 +68,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/digdelv/clean.sh b/bin/tests/system/digdelv/clean.sh
index 0f442fb59e6440df18ddb48572cd5eb2867cf852..115fb0b4c650447d73b01a513a45ce70c8252111 100644 (file)
--- a/bin/tests/system/digdelv/clean.sh
+++ b/bin/tests/system/digdelv/clean.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-rm -f dig.out.test*
+rm -f dig.out.*test*
 rm -f delv.out.test*
 rm -f */named.memstats
 rm -f */named.run

diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index c22e621b01e141a0409c9d789b82413b1db71bcd..700617b61f62db54f716a2b95a35a40a58276d43 100644 (file)
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -263,7 +263,7 @@ if [ -x ${DIG} ] ; then
   echo "I:checking dig +subnet with various prefix lengths ($n)"
   ret=0
   for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24; do
-      $DIG $DIGOPTS +tcp @10.53.0.2 +subnet=255.255.255.255/$i A a.example > dig.out.test$n 2>&1 || ret=1
+      $DIG $DIGOPTS +tcp @10.53.0.2 +subnet=255.255.255.255/$i A a.example > dig.out.$i.test$n 2>&1 || ret=1
       case $i in
       1|9|17) octet=128 ;;
       2|10|18) octet=192 ;;
@@ -279,8 +279,8 @@ if [ -x ${DIG} ] ; then
       9|10|11|12|13|14|15|16) addr="255.${octet}.0.0";;
       17|18|19|20|21|22|23|24) addr="255.255.${octet}.0" ;;
       esac
-      grep "FORMERR" < dig.out.test.$p.$n > /dev/null && ret=1
-      grep "CLIENT-SUBNET: $addr/$i/0" < dig.out.test$n > /dev/null || ret=1
+      grep "FORMERR" < dig.out.$i.test$n > /dev/null && ret=1
+      grep "CLIENT-SUBNET: $addr/$i/0" < dig.out.$i.test$n > /dev/null || ret=1
   done
   if [ $ret != 0 ]; then echo "I:failed"; fi
   status=`expr $status + $ret`
@@ -510,7 +510,8 @@ if [ -x ${DELV} ] ; then
   if [ $ret != 0 ]; then echo "I:failed"; fi 
   status=`expr $status + $ret`
 
-  exit $status
+  echo "I:exit status: $status"
+  [ $status -eq 0 ] || exit 1
 else
   echo "$DELV is needed, so skipping these delv tests"
 fi

diff --git a/bin/tests/system/dlv/tests.sh b/bin/tests/system/dlv/tests.sh
index e3ba63713f8634863f707c1b2b76bda7601f58b7..0155ccf6838f0168c8a62bdabe11f8a9f52eeaae 100644 (file)
--- a/bin/tests/system/dlv/tests.sh
+++ b/bin/tests/system/dlv/tests.sh
@@ -59,4 +59,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dlvauto/tests.sh b/bin/tests/system/dlvauto/tests.sh
index 6e238e6c23fb5c2364db1674a668e69bf47a99db..9959cf2bdce1bce5c8ecba298da0c8c480bfd965 100644 (file)
--- a/bin/tests/system/dlvauto/tests.sh
+++ b/bin/tests/system/dlvauto/tests.sh
@@ -62,4 +62,5 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dlz/tests.sh b/bin/tests/system/dlz/tests.sh
index c4df4fab490cb913fae418163238954aa73dea6d..101e4ce46e43d60dc4624314cbaf91ba53c73fee 100644 (file)
--- a/bin/tests/system/dlz/tests.sh
+++ b/bin/tests/system/dlz/tests.sh
@@ -79,4 +79,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dlzexternal/tests.sh b/bin/tests/system/dlzexternal/tests.sh
index 1b8313cdd8dd3f71f8cd70d7ac986464789af93b..285ea20b00ea0bc4c72c2da773c3f6f8d8eb3b03 100644 (file)
--- a/bin/tests/system/dlzexternal/tests.sh
+++ b/bin/tests/system/dlzexternal/tests.sh
@@ -202,4 +202,5 @@ lookups=`grep "lookup #.*\.not\.there" ns1/named.run | wc -l`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dname/tests.sh b/bin/tests/system/dname/tests.sh
index d22f54b63d806cf8d364ec69ed0bea88d6cea292..a451e0fd985514b05c46e696343e618d7efe42a1 100644 (file)
--- a/bin/tests/system/dname/tests.sh
+++ b/bin/tests/system/dname/tests.sh
@@ -65,4 +65,4 @@ status=`expr $status + $ret`
 
 echo "I:exit status: $status"
 
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh
index 26808d9b7372989eeebf441c3be9d61e792b42e5..fc4bb59a744641549e5a90fb82c41919be63e274 100644 (file)
--- a/bin/tests/system/dns64/tests.sh
+++ b/bin/tests/system/dns64/tests.sh
@@ -1370,4 +1370,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 5e9a079a2d7dbb7ffcc5cd71530c1d2eaa77f254..4da4adb4d77b12fc4b768a0daa821116a13e3590 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -3295,4 +3295,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index 2f811e4239fb8aac453c59666c8aa26ecc225715..b5adfe9bd87f7e2b960f1e54cb232577087d71a3 100644 (file)
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -174,4 +174,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dscp/tests.sh b/bin/tests/system/dscp/tests.sh
index 22d1ab2b1e5c92105d5d913b058b5bfdfd7f419b..56ac8896820773b6953a73e7f33923be3a5b9901 100644 (file)
--- a/bin/tests/system/dscp/tests.sh
+++ b/bin/tests/system/dscp/tests.sh
@@ -38,4 +38,6 @@ do
        done
        test $ret = 0 || { echo "I:failed"; status=`expr $status + $ret`; }
 done
-exit $status
+
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dsdigest/tests.sh b/bin/tests/system/dsdigest/tests.sh
index 67b0b2f11b085009f55449183ce538fa6aebda63..7d8877a2fac975db20f0fd736d97db36ba0a3841 100644 (file)
--- a/bin/tests/system/dsdigest/tests.sh
+++ b/bin/tests/system/dsdigest/tests.sh
@@ -56,4 +56,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 echo "I:exit status: $status"
 
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh
index 335e5cea93938679536bb5522a9a36f0d35ea339..995d5b2a236f94c1ab3a666b910ec70227c2a3fd 100644 (file)
--- a/bin/tests/system/dyndb/tests.sh
+++ b/bin/tests/system/dyndb/tests.sh
@@ -147,4 +147,5 @@ status=`expr $status + $ret`
 test_del test6.ipv6.example.nil. AAAA || ret=1
 status=`expr $status + $ret`
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/ecdsa/tests.sh b/bin/tests/system/ecdsa/tests.sh
index 349e0f30a22b1c02035351e03f81b26af873172c..8834d9fce36ceaf9c7493ae668a10f2541c279b3 100644 (file)
--- a/bin/tests/system/ecdsa/tests.sh
+++ b/bin/tests/system/ecdsa/tests.sh
@@ -39,4 +39,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/ednscompliance/tests.sh b/bin/tests/system/ednscompliance/tests.sh
index 2c474fae4cf9804fa3627df36f5cea39c7b85d65..d5ff96dbf07ed7c5fd7ed92ffef32937b5b9e54e 100644 (file)
--- a/bin/tests/system/ednscompliance/tests.sh
+++ b/bin/tests/system/ednscompliance/tests.sh
@@ -111,4 +111,4 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/emptyzones/tests.sh b/bin/tests/system/emptyzones/tests.sh
index 98183d3aa624704fef707e7404656f261d515647..9ded980448e49ba9dfb6968d41b58f88cc770109 100644 (file)
--- a/bin/tests/system/emptyzones/tests.sh
+++ b/bin/tests/system/emptyzones/tests.sh
@@ -40,4 +40,5 @@ grep "status: REFUSED" dig.out.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh
index bf3c63c44b3f3de839a0b6cb264093280b1a24d2..fa8f5dc9fb7beda8d621579ce0565894c47189ef 100644 (file)
--- a/bin/tests/system/fetchlimit/tests.sh
+++ b/bin/tests/system/fetchlimit/tests.sh
@@ -183,4 +183,4 @@ if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter-aaaa/tests.sh
index c1c866fd9f3c2d03768f32ea4cb14fb1528ac79f..b229fff35cb6bb00367b34e12f4bbf5d6d8fcdfb 100644 (file)
--- a/bin/tests/system/filter-aaaa/tests.sh
+++ b/bin/tests/system/filter-aaaa/tests.sh
@@ -1381,4 +1381,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/formerr/tests.sh b/bin/tests/system/formerr/tests.sh
index 27f209f240ead7151cc08287172b6cbe7c879653..47774759ef9e9a9a66f1004940d8e81123f7c397 100644 (file)
--- a/bin/tests/system/formerr/tests.sh
+++ b/bin/tests/system/formerr/tests.sh
@@ -46,4 +46,4 @@ fi
 
 echo "I:exit status: $status"
 
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index 37878da79efd5c28faeb580fc771ad5f01d3e1dc..bec8a1f98343e78048ed54ee173dce370f167a1a 100644 (file)
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@@ -138,4 +138,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/geoip/tests.sh b/bin/tests/system/geoip/tests.sh
index ffe4284a14d14a635c7294b03eb26bf300371eaf..629c39dce8d4f5edbe69a97250b983f1603dd1e3 100644 (file)
--- a/bin/tests/system/geoip/tests.sh
+++ b/bin/tests/system/geoip/tests.sh
@@ -485,4 +485,4 @@ $CHECKCONF options.conf || ret=1
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index e9d465fdb61286c877c117eb2cf59d87f2d4ae65..1b4ec6ffe778fab7a879962e120aa5f82413b166 100644 (file)
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -43,4 +43,4 @@ $DIG +norec @10.53.0.1 -p 5300 example.net. a > dig.out || status=1
 $PERL ../digcomp.pl noglue.good dig.out || status=1
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/gost/tests.sh b/bin/tests/system/gost/tests.sh
index 80093ca050b3430305ac6fa0d5306f731d9d8f29..a554752eda860d89d1f75085854f754a2afec5ef 100644 (file)
--- a/bin/tests/system/gost/tests.sh
+++ b/bin/tests/system/gost/tests.sh
@@ -39,4 +39,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index b277f06f414b30a68bcb26f965d9a510ee2e06fb..c08cc4e5d1ebddf98beb3ec69fb7cab84e8980c9 100755 (executable)
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -979,4 +979,5 @@ serial=`awk '$4 == "SOA" { print $7 }' dig.out.ns2.post.test$n`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index 4ba85a90fbef523c369e420b5b6c41e0cdd1f6e9..d4cc78935e0accfd3f3503709d842a07930ff109 100644 (file)
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -266,4 +266,4 @@ if [ ${ret} != 0 ]; then
 fi
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/keymgr/tests.sh b/bin/tests/system/keymgr/tests.sh
index 52ff16027cfa6f158053526d08a41dfb90e2fa10..a34bb46e20bf3f961fffd05c3c3a7cde09636a3b 100644 (file)
--- a/bin/tests/system/keymgr/tests.sh
+++ b/bin/tests/system/keymgr/tests.sh
@@ -103,4 +103,4 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh
index b9e2ccdb928ddb53ca33ae58a3eec17661b42137..fab543f2f01957d183928db958384f4950bb31d9 100755 (executable)
--- a/bin/tests/system/legacy/tests.sh
+++ b/bin/tests/system/legacy/tests.sh
@@ -169,4 +169,4 @@ fi
 
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh
index d5296ecf2de533e26b3c69fbee6237395e89a64f..f521c584cc615d892d94ea70c00f05847bedb9b3 100644 (file)
--- a/bin/tests/system/limits/tests.sh
+++ b/bin/tests/system/limits/tests.sh
@@ -57,4 +57,4 @@ grep 'flags: .*tc.*;' dig.out.exceed > /dev/null || {
 }
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index 7ed1627031db125c3ff2acbcfaf80b2fdf3d0e37..d2c4369368dfd6839fe707bd169329a89c7e81c6 100644 (file)
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -268,4 +268,4 @@ else
 fi
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh
index af59c9027b735510f69a5738f11928d318ce957e..1ce6612e9ee2d4d2bf0ff7392f406bc77aa2e580 100644 (file)
--- a/bin/tests/system/lwresd/tests.sh
+++ b/bin/tests/system/lwresd/tests.sh
@@ -71,4 +71,4 @@ fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh
index d7f393423bdc84ae54ef67105ca5c4d4d26bd691..3f221b692c4191dbdbbac70a3664676f3240d5ca 100644 (file)
--- a/bin/tests/system/masterfile/tests.sh
+++ b/bin/tests/system/masterfile/tests.sh
@@ -63,4 +63,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index cb9cbbef100ba73a9ae325a59fb2582112240d46..00eaf2f19e3f6413a9d06dee63e08621aef5520d 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -290,4 +290,4 @@ grep 'next resign' rndc.out > /dev/null 2>&1 || ret=1
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh
index 28d5ac5740f504f71bed605240ce479dfb15dc64..4e5ce61d7a1bf83dec496725fb58218dae90427d 100644 (file)
--- a/bin/tests/system/metadata/tests.sh
+++ b/bin/tests/system/metadata/tests.sh
@@ -192,4 +192,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh
index 20c53d9e98981fd1bcc8b76ee83ca4ef10bc1b96..92d63d07a72103acefadc7a271ed3a05ec13e489 100644 (file)
--- a/bin/tests/system/mkeys/tests.sh
+++ b/bin/tests/system/mkeys/tests.sh
@@ -543,4 +543,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/names/tests.sh b/bin/tests/system/names/tests.sh
index 9fe49ece2574341d48ca78b3b02910faed844ddb..e5fe98d4d9ba69fd8c4bce423c4eb0e925e9ae1d 100644 (file)
--- a/bin/tests/system/names/tests.sh
+++ b/bin/tests/system/names/tests.sh
@@ -48,4 +48,4 @@ if [ $val -le 1 ]; then
 fi;
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index c98ef261adfc0854e0ef749e5f3968a8f96b03d5..6893fc0f6f3997685008ce3f172bebaf631f0235 100644 (file)
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -213,4 +213,4 @@ grep "test string" dig.out.c.ns5.test$n > /dev/null || ret=1
 status=`expr $ret + $status`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh
index d77afd9fec25bfdbaba48fa80a2943d7278c3ebf..426053f6e6db4375df4d6e5d84f3dd70f44939ce 100644 (file)
--- a/bin/tests/system/nslookup/tests.sh
+++ b/bin/tests/system/nslookup/tests.sh
@@ -32,5 +32,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
-
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index 2a088dae089f4f1ee2882f7d4adfea7a0da3200f..502531b8b6560a19946315cdfcdd9846907b0fa1 100755 (executable)
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -657,4 +657,4 @@ grep "bad name" nsupdate.out4-$n > /dev/null && ret=1
 [ $ret = 0 ] || { echo I:failed; status=1; }
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh
index 3b70f833510622a3f39249fb2f9e09931a85c972..9962bc10c6f2cb18220d90b06ea4e81a0a8d0633 100644 (file)
--- a/bin/tests/system/pending/tests.sh
+++ b/bin/tests/system/pending/tests.sh
@@ -201,4 +201,4 @@ test $ret = 0 || echo I:failed, got "'""$ans""'", expected "'""$expect""'"
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh
index d3cbfa6d9f78ef98b76f393ea866e295d7eb1b88..6af9a87daa2d96b695d43e36cd7705bd9b1ce113 100644 (file)
--- a/bin/tests/system/pipelined/tests.sh
+++ b/bin/tests/system/pipelined/tests.sh
@@ -60,4 +60,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/pkcs11/tests.sh b/bin/tests/system/pkcs11/tests.sh
index 047c79b8b4995d23c1cedf969443fdf39f327ebb..8eb72e1bfb81efd877a35ec3e23e8a034b3cc7ea 100644 (file)
--- a/bin/tests/system/pkcs11/tests.sh
+++ b/bin/tests/system/pkcs11/tests.sh
@@ -79,4 +79,4 @@ END
 done
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/pkcs11ssl/tests.sh b/bin/tests/system/pkcs11ssl/tests.sh
index c22dc4fe1a6b7191b3613b18e1e348fd5d3efdb4..9c45f09249471146659583e0f983e7750d394088 100644 (file)
--- a/bin/tests/system/pkcs11ssl/tests.sh
+++ b/bin/tests/system/pkcs11ssl/tests.sh
@@ -66,4 +66,4 @@ if [ $count != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $count`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh
index a9f7776cb62a4bd9935bc02c1a8e658e199de9dd..ada810367a940207e4688497b26558bc58bc3623 100644 (file)
--- a/bin/tests/system/reclimit/tests.sh
+++ b/bin/tests/system/reclimit/tests.sh
@@ -190,4 +190,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh
index 38c47f95d3bb86035971a5309a1e2c3238a462d2..569d0cc8f6b569a193f17bdc9087a1bcea0d919b 100644 (file)
--- a/bin/tests/system/redirect/tests.sh
+++ b/bin/tests/system/redirect/tests.sh
@@ -525,4 +525,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 8c1fcdebcf8fbe9c3bb5237be80c95b6090d5f12..f48308efe2feee20a3b2a7dd1a47615e46c98292 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -688,5 +688,6 @@ ttl=`awk '/"A" "zero" "ttl"/ { print $2 }' dig.out.1.${n}`
 test ${ttl:-1} -eq 0 || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
+
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index e71780f81da7b859f38f752ae19e1ba970c7edb3..232dde7d59079891d274a90cf5370943108a8df9 100644 (file)
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -557,4 +557,5 @@ EOF
     status=`expr $status + $ret`
 fi
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index fe22153d2ebcc9e88fd3371340a47dbac41618b3..597b2c89048189184681e70068c6e25bb0890684 100644 (file)
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -647,4 +647,4 @@ $DIG -p 5300 @$ns3 ns example.com > dig.out.delegation
 grep "status: SERVFAIL" dig.out.delegation > /dev/null || setret "I:failed"
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh
index ca4841c4eca9c731bac95e4307f9be940b942a02..ee0f08fe963145cab0ebfcd0754248c54d0758c9 100644 (file)
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -335,5 +335,5 @@ if test $p1 -le $p2; then ret=1; fi
 if test $ret != 0; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh
index fd79c7e2f356a28186255a68875da5d730953220..3ed7dc4ab655177342d7e78163ab9e15d56a2d4e 100644 (file)
--- a/bin/tests/system/rrchecker/tests.sh
+++ b/bin/tests/system/rrchecker/tests.sh
@@ -79,4 +79,4 @@ done
 test $ret -eq 0 || { echo "I:failed"; status=`expr $status + 1`; }
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index 73f1b828478b22aed3fab526620c926cdaa25764..8a246c9b5cc404af1a92c4095061eb428331382a 100644 (file)
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -284,6 +284,6 @@ if [ -f named.pid ]; then
 fi
 
 echo "I:exit status: $ret"
-exit $ret
+[ $ret -eq 0 ] || exit 1
 #[ $ret -ne 0 ] && echo "I:test failure overridden"
-#exit 0
+#[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index 0ca76dd724e17791429f132bec21b53dadd8c224..78db9342917bc00f6e156e738b729d5df6c271d6 100644 (file)
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -475,4 +475,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 
 status=`expr $status + $ret`
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/rsabigexponent/tests.sh b/bin/tests/system/rsabigexponent/tests.sh
index ef7d18c789eff3089a18d5fd6d4c5f2af01623f3..9bd02c59d1a38e575ad1598977ad508e8371024d 100644 (file)
--- a/bin/tests/system/rsabigexponent/tests.sh
+++ b/bin/tests/system/rsabigexponent/tests.sh
@@ -59,4 +59,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index 7672b835abcc8fe10e9263cb35ac1c5c4e09cbe1..9d17f2b2bb2352827478dc20ea51a473eb006f3c 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -58,4 +58,5 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/sfcache/tests.sh b/bin/tests/system/sfcache/tests.sh
index 2692585fcc96574467bbd7eef986ebe401f589d1..033c52562a13e53e7d71e1515eeade81825a486c 100644 (file)
--- a/bin/tests/system/sfcache/tests.sh
+++ b/bin/tests/system/sfcache/tests.sh
@@ -97,4 +97,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh
index 041bb411bf3639db0616011534a2511b3729db37..0dcf32eb0dbe9b7c0001964191b31a6f5bf1527e 100644 (file)
--- a/bin/tests/system/smartsign/tests.sh
+++ b/bin/tests/system/smartsign/tests.sh
@@ -343,4 +343,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh
index c878dcafc740cb1a1ac635ba94e112248731b9fe..668042f7491b25227861bec7b14d7d77f7d041b2 100644 (file)
--- a/bin/tests/system/sortlist/tests.sh
+++ b/bin/tests/system/sortlist/tests.sh
@@ -57,4 +57,4 @@ $DIG +tcp +noadd +nosea +nostat +noquest +noauth +nocomm +nocmd \
         egrep '10.53.0.5$' >> test2.out || status=1
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/spf/tests.sh b/bin/tests/system/spf/tests.sh
index ba8ddd4239182e97ac813fe301a00f3a0a926693..ba71a7d95b055890289f92004982f0da0af332f2 100644 (file)
--- a/bin/tests/system/spf/tests.sh
+++ b/bin/tests/system/spf/tests.sh
@@ -39,4 +39,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh
index edb2aa5f48a8d90ee0e177d57f353c71775bd622..d2595f2deb85d3b79fe8d5f58df9b720f59ff72d 100755 (executable)
--- a/bin/tests/system/staticstub/tests.sh
+++ b/bin/tests/system/staticstub/tests.sh
@@ -214,4 +214,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh
index 49524fa9f61340e84c2685bf912a3e8e5ddd5fba..6e4c772da648f720122be5e771b8df2fe66a42fa 100644 (file)
--- a/bin/tests/system/statistics/tests.sh
+++ b/bin/tests/system/statistics/tests.sh
@@ -143,4 +143,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index df4e25aff0c4c3b22dbe10ff0a19e91af2ec1452..f4933f9a2526a3a2aff0c0afd629465ec2d1221a 100644 (file)
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -210,4 +210,4 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/stress/tests.sh b/bin/tests/system/stress/tests.sh
index 3e61ff9300cece5024ade36d529efa7905986ea9..343154ff40a08a14927096ab43e6931994516efd 100644 (file)
--- a/bin/tests/system/stress/tests.sh
+++ b/bin/tests/system/stress/tests.sh
@@ -40,4 +40,4 @@ echo "I:killing reload loop"
 kill `cat reload.pid`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh
index 071a5e8b6503740926f81a09fce1144b25d86bec..c689fc0ccc81ef96f5f844a0a106ae87b406f482 100644 (file)
--- a/bin/tests/system/stub/tests.sh
+++ b/bin/tests/system/stub/tests.sh
@@ -67,4 +67,4 @@ $PERL ../digcomp.pl knowngood.dig.out.rec dig.out.ns3 || ret=1
 done
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh
index 91f0b61f2cfcf62aee81a029d705550eafef8e22..7aac35dfb34aabcd8c2142af87076bdcbd9563f7 100644 (file)
--- a/bin/tests/system/tcp/tests.sh
+++ b/bin/tests/system/tcp/tests.sh
@@ -58,4 +58,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh
index 94af6f2b08f0cc1e7096a35586204b1fd9cc30d0..3884a5bf43196e5847c1e89d57e9b5f01472bbd3 100644 (file)
--- a/bin/tests/system/tkey/tests.sh
+++ b/bin/tests/system/tkey/tests.sh
@@ -150,4 +150,4 @@ fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh
index 156416f9be24b7c6e565df9a072028733b85f356..9055ae19c7639d1194062f1b2b094889cf318d75 100644 (file)
--- a/bin/tests/system/tsig/tests.sh
+++ b/bin/tests/system/tsig/tests.sh
@@ -244,4 +244,5 @@ if [ $ret -eq 1 ] ; then
        echo "I: failed"; status=1
 fi
 
-exit $status
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh
index 578d17bbac43215bb7c2305d462bc6808eb4c4d6..fd94eb9b47d813c16c3bca7cf1077da73cf92bd8 100644 (file)
--- a/bin/tests/system/tsiggss/tests.sh
+++ b/bin/tests/system/tsiggss/tests.sh
@@ -92,4 +92,6 @@ status=`expr $status + $ret`
 [ $status -eq 0 ] && echo "I:tsiggss tests all OK"
 
 kill `cat authsock.pid`
-exit $status
+
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh
index 55c7ca6db579df582da7dc8d72fa3ac8b692e2d8..4cf669d0ce4cd96453e9d67d4120ccc983393f3c 100644 (file)
--- a/bin/tests/system/unknown/tests.sh
+++ b/bin/tests/system/unknown/tests.sh
@@ -196,4 +196,4 @@ status=`expr $status + $ret`
 
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index 3d283570f225d72263f60fd6008cebce5898c420..f0d0ef03b834b05d4b22347af1a9e02f39d3ade4 100644 (file)
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -202,4 +202,4 @@ EOF
 fi
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/v6synth/tests.sh b/bin/tests/system/v6synth/tests.sh
index c5731e197cd712215bb9988c558cbdc760d9b0a7..40fe54e5ebb06abcf6da1518f0935dac775a6fc4 100644 (file)
--- a/bin/tests/system/v6synth/tests.sh
+++ b/bin/tests/system/v6synth/tests.sh
@@ -68,4 +68,4 @@ EOF
 diff good.out dig.out || status=1
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/verify/tests.sh b/bin/tests/system/verify/tests.sh
index 66b705c0566fd6ce365f09028bb821f196993c39..1581e2f6391812143f123b1759b6a984e1c26776 100644 (file)
--- a/bin/tests/system/verify/tests.sh
+++ b/bin/tests/system/verify/tests.sh
@@ -93,4 +93,6 @@ do
        [ $ret = 0 ] || failed
        [ $dumpit = 1 ] && cat verify.out.$n
 done
-exit $status
+
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index b90d7f5edf99298d557ec9695b156ba481c5674d..fcdbd092789221ddaffb0fb1e469965dfd032df5 100644 (file)
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -139,4 +139,4 @@ then
 fi
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/wildcard/tests.sh b/bin/tests/system/wildcard/tests.sh
index ac55b8438455c21f47139425fa2ccd9fcf0682c4..c2e71f94035a6eabf0dc4472a0ef9aff9f1c778f 100644 (file)
--- a/bin/tests/system/wildcard/tests.sh
+++ b/bin/tests/system/wildcard/tests.sh
@@ -151,4 +151,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 7928d7d9badeb7aaf37b8cb40fc2de7a35e2c76c..a0bcabdb531eb289fb1d55845b9de59dbd8149df 100644 (file)
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -422,4 +422,4 @@ if test $tmp != 0 ; then echo "I:failed"; fi
 status=`expr $status + $tmp`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index b5e03368f99b1688534aca66b906f1ebf756d3a9..ffb90b970212717fc165e7a847b3de012be50416 100644 (file)
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -68,4 +68,4 @@ grep ";" dig.out.ns2
 $PERL ../digcomp.pl dig.out.ns1 dig.out.ns2 || status=1
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh
index 7dd3d78cb2d7af4ac1547a84862991e081ec0d92..b11f7de85391c5895c10c9f53d51b57329475c7a 100644 (file)
--- a/bin/tests/system/zero/tests.sh
+++ b/bin/tests/system/zero/tests.sh
@@ -58,4 +58,4 @@ if [ $count -ne 7 ] ; then echo "I:failed (count=$count)"; ret=1; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh
index 9ec7c741caca4aec0d168046507dfe5fabbe0205..7b4c4cecf9e2a92db77fca60e7ab133dedf2b805 100644 (file)
--- a/bin/tests/system/zonechecks/tests.sh
+++ b/bin/tests/system/zonechecks/tests.sh
@@ -254,4 +254,4 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:exit status: $status"
-exit $status
+[ $status -eq 0 ] || exit 1