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

Remove bin/tests/system/logfileconfig/ns1/named.conf and add setup.sh

Browse Source 
in order to resolve changing named.conf issue.  [RT #23687]
This commit is contained in:
Scott Mann
2011-03-22 16:51:50 +00:00
parent e373527fba
commit 95759de490
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/tests/system/logfileconfig/clean.sh
View File

@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.3 2011/03/05 23:52:30 tbox Exp $
# $Id: clean.sh,v 1.4 2011/03/22 16:51:50 smann Exp $
#
# Clean up after log file tests
@@ -22,5 +22,5 @@
rm -f ns1/named.pid ns1/named.run
rm -f ns1/named.memstats ns1/dig.out
rm -f ns1/named_log ns1/named_pipe ns1/named_sym
rm -f ns1/named.conf
rm -rf ns1/named_dir
cp ns1/named.plain ns1/named.conf

24
bin/tests/system/logfileconfig/setup.sh Normal file
View File

@@ -0,0 +1,24 @@
#!/bin/sh
#
# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: setup.sh,v 1.2 2011/03/22 16:51:50 smann Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
sh clean.sh
cp ns1/named.plain ns1/named.conf

5
bin/tests/system/logfileconfig/tests.sh
View File

@@ -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.3 2011/03/05 23:52:30 tbox Exp $
# $Id: tests.sh,v 1.4 2011/03/22 16:51:50 smann Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -38,9 +38,6 @@ myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record,size,mctx -T clien
#
$PERL ../stop.pl . ns1
# Make sure everything is cleaned up
sh ./clean.sh
cd $CONFDIR
$myNAMED > /dev/null 2>&1