[master] Properly handle errors in rrchecker system test

4657.	[bug]		rrchecker system test result could be improperly
			determined. [RT #45602]

diff --git a/CHANGES b/CHANGES
index cd7a79f57ac8422318dbf8e6f55764d11652f19a..7b6825a2c789fa9cfe72ff9254b3e9a9e0511d07 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4657.  [bug]           rrchecker system test result could be improperly
+                       determined. [RT #45602]
+
 4656.  [bug]           Apply "port" and "dscp" values specified in catalog
                        zone's "default-masters" option to the generated
                        configuration of its member zones. [RT #45545]

diff --git a/bin/tests/system/rrchecker/clean.sh b/bin/tests/system/rrchecker/clean.sh
index 67224fa12c52285454d295b516ac3ba210413dd0..7b03b08a404ede5ff6e4deef40c6a415cf2bb646 100644 (file)
--- a/bin/tests/system/rrchecker/clean.sh
+++ b/bin/tests/system/rrchecker/clean.sh
@@ -4,5 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-rm -f classlist.out privatelist.out typelist.out tempzone checker.out
+rm -f classlist.out privatelist.out typelist.out tempzone checkzone.out* checker.out
 rm -f ns*/named.lock

diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh
index 452f128077d0b2b5d884451bb1e36e3b7f8e7484..11c78bb70baef7dbdcdba2f25e11d6bc052bd3b4 100644 (file)
--- a/bin/tests/system/rrchecker/tests.sh
+++ b/bin/tests/system/rrchecker/tests.sh
@@ -10,17 +10,20 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 status=0
-t=0
+n=0
 
-echo "I:class list"
+n=`expr $n + 1`
+echo "I:class list ($n)"
 $RRCHECKER -C > classlist.out
 $DIFF classlist.out classlist.good || { echo "I:failed"; status=`expr $status + 1`; }
 
-echo "I:type list"
+n=`expr $n + 1`
+echo "I:type list ($n)"
 $RRCHECKER -T > typelist.out
 $DIFF typelist.out typelist.good || { echo "I:failed"; status=`expr $status + 1`; }
 
-echo "I:private type list"
+n=`expr $n + 1`
+echo "I:private type list ($n)"
 $RRCHECKER -P > privatelist.out
 $DIFF privatelist.out privatelist.good || { echo "I:failed"; status=`expr $status + 1`; }
 
@@ -30,11 +33,12 @@ $*
 EOF
 }
 
-echo "I:check conversions to canonical format"
+n=`expr $n + 1`
+echo "I:check conversions to canonical format ($n)"
 ret=0
 $SHELL ../genzone.sh 0 > tempzone
-$CHECKZONE -Dq . tempzone | sed '/^;/d' |
-while read -r n tt cl ty rest
+$CHECKZONE -Dq . tempzone | sed '/^;/d' > checkzone.out$n
+while read -r name tt cl ty rest
 do
        myecho "$cl $ty $rest" | $RRCHECKER -p > checker.out || {
                ret=1
@@ -45,13 +49,14 @@ do
                ret=1
                echo "I: '$cl $ty $rest' != '$cl0 $ty0 $rest0'"
        }
-done
+done < checkzone.out$n
 test $ret -eq 0 || { echo "I:failed"; status=`expr $status + 1`; }
 
-echo "I:check conversions to and from unknown record format"
+n=`expr $n + 1`
+echo "I:check conversions to and from unknown record format ($n)"
 ret=0
-$CHECKZONE -Dq . tempzone | sed '/^;/d' |
-while read -r n tt cl ty rest
+$CHECKZONE -Dq . tempzone | sed '/^;/d' > checkzone.out$n
+while read -r name tt cl ty rest
 do
        myecho "$cl $ty $rest" | $RRCHECKER -u > checker.out || {
                ret=1
@@ -67,7 +72,7 @@ do
                ret=1
                echo "I: '$cl $ty $rest' != '$cl0 $ty0 $rest0'"
        }
-done
+done < checkzone.out$n
 test $ret -eq 0 || { echo "I:failed"; status=`expr $status + 1`; }
 
 echo "I:exit status: $status"