[master] masterfile-style

3814.	[func]		The "masterfile-style" zone option controls the
			formatting of dumped zone files. Options are
			"relative" (multiline format) and "full" (one
			record per line). The default is "relative".
			[RT #20798]

bin/tests/system/masterformat/tests.sh

@@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
@@ -35,6 +33,15 @@ israw () {
     return $?
 }
 
+isfull () {
+    # there should be no whitespace at the beginning of a line
+    if grep '^[ 	][ 	]*' $1 > /dev/null 2>&1; then
+	return 1
+    else
+	return 0
+    fi
+}
+
 rawversion () {
     perl -e 'binmode STDIN;
              read(STDIN, $input, 8);
@@ -132,6 +139,13 @@ status=`expr $status + $ret`
 echo "I:checking that slave was saved in text format when configured"
 ret=0
 israw ns2/transfer.db.txt && ret=1
+isfull ns2/transfer.db.txt && ret=1
+[ $ret -eq 0 ] || echo "I:failed"
+status=`expr $status + $ret`
+
+echo "I:checking that slave was saved in 'full' style when configured"
+ret=0
+isfull ns2/transfer.db.full > /dev/null 2>&1 || ret=1
 [ $ret -eq 0 ] || echo "I:failed"
 status=`expr $status + $ret`