From bfe720adb59abd0fca1028663045ba070fc0c51d Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 17 Jan 2012 08:26:03 +0000 Subject: [PATCH] reverse accidental commit --- bin/tests/system/inline/clean.sh | 4 ++-- bin/tests/system/inline/tests.sh | 17 +---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh index a29b6e77e0..1f4a85cad0 100644 --- a/bin/tests/system/inline/clean.sh +++ b/bin/tests/system/inline/clean.sh @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.11 2012/01/16 08:35:08 marka Exp $ +# $Id: clean.sh,v 1.12 2012/01/17 08:26:03 marka Exp $ rm -f */named.memstats rm -f */named.run @@ -58,7 +58,7 @@ rm -f ns5/bits.bk rm -f ns5/bits.bk.jnl rm -f ns5/bits.bk.signed rm -f ns5/bits.bk.signed.jnl -# rm -f */*.jbk +rm -f */*.jbk rm -f random.data rm -f dig.out.ns*.test* rm -f signing.out* diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index 8c3effa211..a5ef0b156d 100644 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/tests.sh @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.15 2012/01/16 08:35:09 marka Exp $ +# $Id: tests.sh,v 1.16 2012/01/17 08:26:03 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh @@ -420,10 +420,6 @@ $PERL ../stop.pl . ns3 || ret=1 if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -n=`expr $n + 1` -echo "I:update master zone while shutdown ($n)" -cp ns3/master3.db.in ns3/master.db - n=`expr $n + 1` echo "I:restart bump in the wire signer server ($n)" ret=0 @@ -431,17 +427,6 @@ $PERL ../start.pl --noclean --restart . ns3 || ret=1 if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` - -####n=`expr $n + 1` -####echo "I:checking that update while server is offline is detected ($n)" -####ret=0 -####$DIG $DIGOPTS @10.53.0.3 -p 5300 f.master A > dig.out.ns2.test$n -####grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1 -####grep "ANSWER: 2," dig.out.ns2.test$n > /dev/null || ret=1 -####grep "10.0.0.6" dig.out.ns2.test$n > /dev/null || ret=1 -####if [ $ret != 0 ]; then echo "I:failed"; fi -####status=`expr $status + $ret` - $NSUPDATE << EOF zone bits server 10.53.0.2 5300