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

in order to resolve changing named.conf issue.  [RT #23687]

diff --git a/CHANGES b/CHANGES
index 2d265701ff54ee0b387d9f56885c818c6d2143c5..9e0b6ac455eae374752ec63eaf9add107d73b0d0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3088.  [bug]           Remove bin/tests/system/logfileconfig/ns1/named.conf
+                       and add setup.sh in order to resolve changing
+                       named.conf issue.  [RT #23687]
+
 3087.  [bug]           DDNS updates using SIG(0) with update-policy match
                        type "external" could cause a crash. [RT #23735]
 

diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index fbb15d5932315712aa182ecd02aef076b36cf7bd..ba2fedc19b5cc5ef200c74d0b2178b5417b4848b 100644 (file)
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -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

diff --git a/bin/tests/system/logfileconfig/setup.sh b/bin/tests/system/logfileconfig/setup.sh
new file mode 100644 (file)
index 0000000..eba2216
--- /dev/null
+++ b/bin/tests/system/logfileconfig/setup.sh
@@ -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

diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index a008365f1b784b3be01b815f75f9f0657bd9865e..3c8586b10dd0cd3aafe8f0df412d9ee737e658a2 100644 (file)
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/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.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