ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[master] change "fast" to "map"

Browse Source 
3475.	[cleanup]	Changed name of 'map' zone file format (previously
			'fast'). [RT #32458]
This commit is contained in:
Evan Hunt
2013-01-24 14:20:48 -08:00
parent dd59fe01c9
commit c9611b4573
27 changed files with 103 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/tests/system/masterformat/clean.sh
View File

@@ -21,7 +21,7 @@ rm -f ns1/example.db.raw*
rm -f ns1/example.db.compat
rm -f ns1/example.db.serial.raw
rm -f ns1/large.db ns1/large.db.raw
rm -f ns1/example.db.fast
rm -f ns1/example.db.map
rm -f dig.out.*
rm -f dig.out
rm -f */named.memstats
@@ -30,6 +30,6 @@ rm -f ns2/transfer.db.*
rm -f ns2/formerly-text.db
rm -f ns2/db-*
rm -f ns2/large.bk
rm -f ns3/example.db.fast ns3/dynamic.db.fast
rm -f baseline.txt text.1 text.2 raw.1 raw.2 fast.1 fast.2
rm -f ns3/example.db.map ns3/dynamic.db.map
rm -f baseline.txt text.1 text.2 raw.1 raw.2 map.1 map.2

6
bin/tests/system/masterformat/ns1/compile.sh
View File

@@ -16,9 +16,9 @@
../named-compilezone -D -F raw -o example.db.raw example \
example.db > /dev/null 2>&1
../named-compilezone -D -F fast -o ../ns3/example.db.fast example \
../named-compilezone -D -F map -o ../ns3/example.db.map example \
example.db > /dev/null 2>&1
../named-compilezone -D -F fast -o ../ns3/dynamic.db.fast dynamic \
../named-compilezone -D -F map -o ../ns3/dynamic.db.map dynamic \
example.db > /dev/null 2>&1
../named-compilezone -D -F raw=1 -o example.db.raw1 example-explicit \
example.db > /dev/null 2>&1
@@ -27,6 +27,6 @@
../named-compilezone -D -F raw -L 3333 -o example.db.serial.raw example \
example.db > /dev/null 2>&1
../named-compilezone -D -F raw -o large.db.raw large large.db > /dev/null 2>&1
../named-compilezone -D -F fast -o example.db.fast example-fast \
../named-compilezone -D -F map -o example.db.map example-map \
example.db > /dev/null 2>&1

8
bin/tests/system/masterformat/ns3/named.conf
View File

@@ -41,14 +41,14 @@ controls {
zone "example" {
type master;
masterfile-format fast;
file "example.db.fast";
masterfile-format map;
file "example.db.map";
};
zone "dynamic" {
type master;
masterfile-format fast;
file "dynamic.db.fast";
masterfile-format map;
file "dynamic.db.map";
allow-update { any; };
};

24
bin/tests/system/masterformat/tests.sh
View File

@@ -19,7 +19,7 @@
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
isfast () {
ismap () {
perl -e 'binmode STDIN;
read(STDIN, $input, 8);
($style, $version) = unpack("NN", $input);
@@ -41,7 +41,7 @@ rawversion () {
if (length($input) < 8) { print "not raw\n"; exit 0; };
($style, $version) = unpack("NN", $input);
print ($style == 2 || $style == 3 ? "$version\n" :
"not raw or fast\n");' < $1
"not raw or map\n");' < $1
}
sourceserial () {
@@ -91,11 +91,11 @@ ret=0
israw ns1/example.db.raw || ret=1
israw ns1/example.db.raw1 || ret=1
israw ns1/example.db.compat || ret=1
isfast ns1/example.db.fast || ret=1
ismap ns1/example.db.map || ret=1
[ "`rawversion ns1/example.db.raw`" = 1 ] || ret=1
[ "`rawversion ns1/example.db.raw1`" = 1 ] || ret=1
[ "`rawversion ns1/example.db.compat`" = 0 ] || ret=1
[ "`rawversion ns1/example.db.fast`" = 1 ] || ret=1
[ "`rawversion ns1/example.db.map`" = 1 ] || ret=1
[ $ret -eq 0 ] || echo "I:failed"
status=`expr $status + $ret`
@@ -150,26 +150,26 @@ done
sleep 1
done
echo "I:checking format transitions: text->raw->fast->text"
echo "I:checking format transitions: text->raw->map->text"
ret=0
./named-compilezone -D -f text -F text -o baseline.txt example.nil ns1/example.db > /dev/null
./named-compilezone -D -f text -F raw -o raw.1 example.nil baseline.txt > /dev/null
./named-compilezone -D -f raw -F fast -o fast.1 example.nil raw.1 > /dev/null
./named-compilezone -D -f fast -F text -o text.1 example.nil fast.1 > /dev/null
./named-compilezone -D -f raw -F map -o map.1 example.nil raw.1 > /dev/null
./named-compilezone -D -f map -F text -o text.1 example.nil map.1 > /dev/null
cmp -s baseline.txt text.1 || ret=0
[ $ret -eq 0 ] || echo "I:failed"
status=`expr $status + $ret`
echo "I:checking format transitions: text->fast->raw->text"
echo "I:checking format transitions: text->map->raw->text"
ret=0
./named-compilezone -D -f text -F fast -o fast.2 example.nil baseline.txt > /dev/null
./named-compilezone -D -f fast -F raw -o raw.2 example.nil fast.2 > /dev/null
./named-compilezone -D -f text -F map -o map.2 example.nil baseline.txt > /dev/null
./named-compilezone -D -f map -F raw -o raw.2 example.nil map.2 > /dev/null
./named-compilezone -D -f raw -F text -o text.2 example.nil raw.2 > /dev/null
cmp -s baseline.txt text.2 || ret=0
[ $ret -eq 0 ] || echo "I:failed"
status=`expr $status + $ret`
echo "I:checking fast format loading with journal file rollforward"
echo "I:checking map format loading with journal file rollforward"
ret=0
$NSUPDATE <<END > /dev/null || status=1
server 10.53.0.3 5300
@@ -197,7 +197,7 @@ grep "NXDOMAIN" dig.out.dynamic.3.4 > /dev/null 2>&1 || ret=1
[ $ret -eq 0 ] || echo "I:failed"
status=`expr $status + $ret`
echo "I:checking fast format file dumps correctly"
echo "I:checking map format file dumps correctly"
ret=0
$NSUPDATE <<END > /dev/null || status=1
server 10.53.0.3 5300