Commit 41173c0a authored by Mark Andrews's avatar Mark Andrews

remove space from before 'failed'; count errors

(cherry picked from commit 879c63b5)
parent b700eb67
......@@ -24,7 +24,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +rec -t RT rt.rt.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -32,7 +32,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +rec -t RT rt.rt2.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -40,7 +40,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +rec -t NAPTR nap.naptr.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -48,7 +48,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +rec -t NAPTR nap.hang3b.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -78,7 +78,7 @@ dotests() {
;;
esac
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -94,7 +94,7 @@ dotests() {
grep -w "L32" dig.out.$n > /dev/null && ret=1
fi
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -112,7 +112,7 @@ dotests() {
grep -w "L32" dig.out.$n > /dev/null && ret=1
fi
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -120,7 +120,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +norec -t RT rt.rt.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -128,7 +128,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +norec -t RT rt.rt2.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -136,7 +136,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +norec -t NAPTR nap.naptr.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -144,7 +144,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +norec -t NAPTR nap.hang3b.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -174,7 +174,7 @@ dotests() {
;;
esac
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -190,7 +190,7 @@ dotests() {
grep -w "L32" dig.out.$n > /dev/null && ret=1
fi
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -208,7 +208,7 @@ dotests() {
grep -w "L32" dig.out.$n > /dev/null && ret=1
fi
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -218,7 +218,7 @@ dotests() {
# Always expect glue for root priming queries, regardless $minimal
grep 'ADDITIONAL: 3' dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -240,7 +240,7 @@ dotests() {
;;
esac
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
}
......@@ -263,7 +263,7 @@ ret=0
$DIG $DIGOPTS -t ANY www.rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "ANSWER: 3, AUTHORITY: 1, ADDITIONAL: 2" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
echo_i "reconfiguring server: minimal-any yes"
......@@ -277,7 +277,7 @@ ret=0
$DIG $DIGOPTS -t ANY +notcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -286,7 +286,7 @@ ret=0
$DIG $DIGOPTS -t ANY +tcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "ANSWER: 3, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -295,7 +295,7 @@ ret=0
$DIG $DIGOPTS -t ANY +notcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
echo_i "testing with 'minimal-responses no-auth;'"
......@@ -319,7 +319,7 @@ grep "mx\.example\..*MX.0 mail\.mx\.example" dig.out.$n > /dev/null || ret=1
grep "mail\.mx\.example\..*A.1\.2\.3\.4" dig.out.$n > /dev/null || ret=1
grep "_25\._tcp\.mail\.mx\.example\..*TLSA.3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -330,7 +330,7 @@ grep "_xmpp-client\._tcp\.srv\.example\..*SRV.1 0 5222 server\.srv\.example" dig
grep "server\.srv\.example\..*A.1\.2\.3\.4" dig.out.$n > /dev/null || ret=1
grep "_5222\._tcp\.server\.srv\.example\..*TLSA.3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
echo_i "reconfiguring server: minimal-responses no"
......@@ -345,7 +345,7 @@ $DIG $DIGOPTS -t ANY rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "AUTHORITY: 0" dig.out.$n > /dev/null || ret=1
grep "NS[ ]*ns" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -355,7 +355,7 @@ $DIG $DIGOPTS -t ANY rt.example @10.53.0.3 > dig.out.$n || ret=1
grep "AUTHORITY: 0" dig.out.$n > /dev/null || ret=1
grep "NS[ ]*ns" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
echo_i "exit status: $status"
......
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