From b2d3df5efd0c30cfa25db6583a12828751b7526d Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 10 Jun 2014 12:28:33 +1000 Subject: [PATCH] update spf check (cherry picked from commit 32a1fd3dd27277717003d45af37f382956bb6783) --- bin/tests/system/checkzone/tests.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh index 2353c145e7..7d9192e163 100644 --- a/bin/tests/system/checkzone/tests.sh +++ b/bin/tests/system/checkzone/tests.sh @@ -44,12 +44,12 @@ echo "I:checking with spf warnings ($n)" ret=0 $CHECKZONE example zones/spf.db > test.out1.$n 2>&1 || ret=1 $CHECKZONE -T ignore example zones/spf.db > test.out2.$n 2>&1 || ret=1 -grep "'x.example' found SPF/TXT" test.out1.$n > /dev/null || ret=1 -grep "'y.example' found SPF/SPF" test.out1.$n > /dev/null || ret=1 -grep "'example' found SPF/" test.out1.$n > /dev/null && ret=1 -grep "'x.example' found SPF/" test.out2.$n > /dev/null && ret=1 -grep "'y.example' found SPF/" test.out2.$n > /dev/null && ret=1 -grep "'example' found SPF/" test.out2.$n > /dev/null && ret=1 +grep "'x.example' found type SPF" test.out1.$n > /dev/null && ret=1 +grep "'y.example' found type SPF" test.out1.$n > /dev/null || ret=1 +grep "'example' found type SPF" test.out1.$n > /dev/null && ret=1 +grep "'x.example' found type SPF" test.out2.$n > /dev/null && ret=1 +grep "'y.example' found type SPF" test.out2.$n > /dev/null && ret=1 +grep "'example' found type SPF" test.out2.$n > /dev/null && ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret`