fixed an error in the mkeys system test

diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh
index 4c635d4f2afa8f80f2bf3289c6f3d177edec1873..2c38baf3fc00ec91d369524bd846feb9b7404cfa 100644 (file)
--- a/bin/tests/system/mkeys/clean.sh
+++ b/bin/tests/system/mkeys/clean.sh
@@ -17,7 +17,7 @@ rm -f */managed-keys.bind* */named.secroots
 rm -f */managed.conf ns1/managed.key ns1/managed.key.id
 rm -f */named.memstats */named.run */named.run.prev
 rm -f dig.out* delv.out* rndc.out* signer.out*
-rm -f ns1/root.db.signed* ns1/root.db.tmp
+rm -f ns1/root.db.signed* ns1/root.db.tmp ns1/root.db.orig
 rm -f */named.conf
 rm -f ns5/named.args
 rm -f ns7/view1.mkeys ns7/view2.mkeys

diff --git a/bin/tests/system/mkeys/ns6/setup.sh b/bin/tests/system/mkeys/ns6/setup.sh
index 5ba1647da581a12b9896eddc193f9c929d32f828..3416faf625601fb4c9aa258b9831c87f75233805 100644 (file)
--- a/bin/tests/system/mkeys/ns6/setup.sh
+++ b/bin/tests/system/mkeys/ns6/setup.sh
@@ -16,7 +16,7 @@ zone=.
 zonefile=root.db
 
 # an RSA key
-rsakey=`$KEYGEN -a rsasha256 -qfk rsasha256.`
+rsakey=`$KEYGEN -a rsasha256 -b 2048 -qfk rsasha256.`
 
 # a key with unsupported algorithm
 unsupportedkey=Kunknown.+255+00000

diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh
index 58ecb8ce45f11a12ede4b4bb1651ebc846ef563b..dc14abc3923fb47509d21bcc8d7f9b4e4d7a961b 100644 (file)
--- a/bin/tests/system/mkeys/setup.sh
+++ b/bin/tests/system/mkeys/setup.sh
@@ -22,6 +22,7 @@ copy_setports ns2/named.conf.in ns2/named.conf
 copy_setports ns3/named.conf.in ns3/named.conf
 copy_setports ns5/named.conf.in ns5/named.conf
 copy_setports ns6/named.conf.in ns6/named.conf
+copy_setports ns7/named.conf.in ns7/named.conf
 
 cp ns5/named1.args ns5/named.args