1584. [bug] "make test" failed with a readonly source tree.

                        [RT #10461]

diff --git a/CHANGES b/CHANGES
index 26d6e70685a59bb4620889d56824e787710e398b..b6ac5eeb3eb03d2ebc17f8225090a2d2dbe7ec58 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,8 @@
 
 1585.  [placeholder]
 
-1584.  [placeholder]   rt10461
+1584.  [bug]           "make test" failed with a readonly source tree.
+                       [RT #10461]
 
 1583.  [bug]           Records add via UPDATE failed to get the correct trust
                        level. [RT #10452]

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 38fb21816ce51e0cccc0d9daef1d7fdd11d3ed50..5ff2abe958687563836e9f821b668b98f4a22d4f 100644 (file)
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -15,12 +15,13 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.14 2004/03/05 05:00:08 marka Exp $
+# $Id: clean.sh,v 1.15 2004/03/10 01:06:04 marka Exp $
 
 rm -f */K* */keyset-* */signedkey-* */*.signed */trusted.conf */tmp*
 rm -f ns1/root.db ns2/example.db ns3/secure.example.db
 rm -f ns3/unsecure.example.db ns3/bogus.example.db ns3/keyless.example.db
 rm -f ns3/dynamic.example.db ns3/dynamic.example.db.signed.jnl
+rm -f */example.bk
 rm -f dig.out.*
 rm -f random.data
 

diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index e1bf896fd968bcb572b3418d3eecedd027269b6b..7338f89e5c2d504d01a09da8770b3e72c519247a 100644 (file)
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.11 2004/03/05 05:00:09 marka Exp $
+# $Id: setup.sh,v 1.12 2004/03/10 01:06:04 marka Exp $
 
 ../../genrandom 400 random.data
 
@@ -23,4 +23,4 @@ cd ns1 && sh sign.sh
 
 echo "a.bogus.example. A       10.0.0.22" >>../ns3/bogus.example.db.signed
 
-cd ../ns5 && cp trusted.conf.bad trusted.conf
+cd ../ns5 && cp -f trusted.conf.bad trusted.conf

diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index eb066fc58b5b36ecb9da51752eb15b3e042b8287..0ab8d59af2606d724248ab7537154022906a4bb4 100644 (file)
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -15,6 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.3 2004/03/05 05:00:55 marka Exp $
+# $Id: setup.sh,v 1.4 2004/03/10 01:06:04 marka Exp $
 
-cd ns1 && cp cache.in cache
+cd ns1 && cp -f cache.in cache

diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index a98f12df34f401ee84f7f91f65bf70a5b141b6fe..fb43e470c9643c2aefd6413ded4c2c957493c2f4 100644 (file)
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -15,11 +15,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.8 2004/03/05 05:01:39 marka Exp $
+# $Id: clean.sh,v 1.9 2004/03/10 01:06:04 marka Exp $
 
 #
 # Clean up after zone transfer tests.
 #
 
 rm -f ns3/example.bk dig.out.ns2 dig.out.ns3
+rm -f ns2/example.db
 

diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh
index 01eee7b58158840ba06e34c5863189edbcf8fa1a..b81d160f0637aac755260543b9e999f66007a9fa 100644 (file)
--- a/bin/tests/system/notify/setup.sh
+++ b/bin/tests/system/notify/setup.sh
@@ -15,6 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.7 2004/03/05 05:01:39 marka Exp $
+# $Id: setup.sh,v 1.8 2004/03/10 01:06:04 marka Exp $
 
-cp ns2/example1.db ns2/example.db
+cp -f ns2/example1.db ns2/example.db

diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index 5336eb76ef6dd2cd17a7d16dfc923b97d1c840b4..324d01e8128c12e3054927d0acfa6aa4a77a9365 100644 (file)
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.30 2004/03/05 05:01:39 marka Exp $
+# $Id: tests.sh,v 1.31 2004/03/10 01:06:04 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -33,7 +33,7 @@ grep ";" dig.out.ns3
 $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
 
 rm -f ns2/example.db
-cp ns2/example2.db ns2/example.db
+cp -f ns2/example2.db ns2/example.db
 kill -HUP `cat ns2/named.pid`
 sleep 45
 
@@ -53,7 +53,7 @@ $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
 $PERL $SYSTEMTESTTOP/stop.pl . ns3
 
 rm -f ns2/example.db
-cp ns2/example3.db ns2/example.db
+cp -f ns2/example3.db ns2/example.db
 kill -HUP `cat ns2/named.pid`
 sleep 45
 
@@ -72,7 +72,7 @@ $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
 $PERL $SYSTEMTESTTOP/stop.pl . ns2
 
 rm -f ns2/example.db
-cp ns2/example4.db ns2/example.db
+cp -f ns2/example4.db ns2/example.db
 
 $PERL $SYSTEMTESTTOP/start.pl . ns2
 

diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index 579c2723fc7da7f1e350a1f4f1b9e60a246dba44..eecc625a1506af65090162aeaa5ea0ecfb33aafe 100644 (file)
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.8 2004/03/05 05:01:55 marka Exp $
+# $Id: clean.sh,v 1.9 2004/03/10 01:06:05 marka Exp $
 
 #
 # Clean up after zone transfer tests.
@@ -23,6 +23,8 @@
 
 rm -f dig.out.ns1 dig.out.ns2 dig.out.ns1.after ns1/*.jnl ns2/*.jnl \
     ns1/example.db ns1/update.db
+rm -f ns2/example.bk
+rm -f ns2/update.bk
 
 
 

diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index d03d3c444351c9e4248523278bbbad59e7860631..f545f200c123e4925b5110f6659e1b45599dff86 100644 (file)
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.7 2004/03/05 05:01:55 marka Exp $
+# $Id: setup.sh,v 1.8 2004/03/10 01:06:05 marka Exp $
 
 #
 # jnl and database files MUST be removed before we start
@@ -23,7 +23,7 @@
 
 rm -f ns1/*.jnl ns1/example.db ns2/*.jnl ns2/example.bk
 
-cp ns1/example1.db ns1/example.db
+cp -f ns1/example1.db ns1/example.db
 
 # update_test.pl has its own zone file because it
 # requires a specific NS record set.

diff --git a/bin/tests/system/relay/setup.sh b/bin/tests/system/relay/setup.sh
index 6ec5a8857f5eed6c7ec20a25a671abc5b038127e..8de225e67e557113bdd058a88a5f1b92246518d1 100644 (file)
--- a/bin/tests/system/relay/setup.sh
+++ b/bin/tests/system/relay/setup.sh
@@ -15,6 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.3 2004/03/05 05:02:11 marka Exp $
+# $Id: setup.sh,v 1.4 2004/03/10 01:06:05 marka Exp $
 
-cp ns2/example1.db ns2/example.db
+cp -f ns2/example1.db ns2/example.db

diff --git a/bin/tests/system/relay/tests.sh b/bin/tests/system/relay/tests.sh
index 7797699202aa75df2e9e4610c92b3fa4524ffda2..138e8b7be72033da1bafe6b264d6b0a0bd66d296 100644 (file)
--- a/bin/tests/system/relay/tests.sh
+++ b/bin/tests/system/relay/tests.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.4 2004/03/05 05:02:11 marka Exp $
+# $Id: tests.sh,v 1.5 2004/03/10 01:06:05 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -39,7 +39,7 @@ $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
 $PERL ../digcomp.pl dig.out.ns2 dig.out.ns4 || status=1
 
 rm -f ns2/example.db
-cp ns2/example2.db ns2/example.db
+cp -f ns2/example2.db ns2/example.db
 sleep 6
 kill -HUP `cat ns2/named.pid`
 sleep 60
@@ -70,7 +70,7 @@ if [ $? != 0 ]; then
        rm -f ns3/named.pid
 fi
 rm -f ns2/example.db
-cp ns2/example3.db ns2/example.db
+cp -f ns2/example3.db ns2/example.db
 sleep 6
 
 if [ -f ns3/named.pid ]; then
@@ -118,7 +118,7 @@ if [ -f ns2/named.pid ]; then
        status=1
 fi
 
-cp ns2/example4.db ns2/example.db
+cp -f ns2/example4.db ns2/example.db
 sleep 6
 (cd ns2 ; $NAMED -c named.conf -d 99 -g >> named.run 2>&1 & )
 sleep 60

diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index 269e520443ca796dac2465a2c6fc4ec01c261a4c..fa8ed37d6bc93f594d67808503269e59da0216de 100644 (file)
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.5 2004/03/05 05:03:24 marka Exp $
+# $Id: setup.sh,v 1.6 2004/03/10 01:06:05 marka Exp $
 
-cp ns1/example1.db ns1/example.db
+cp -f ns1/example1.db ns1/example.db
 rm -f ns1/example.db.jnl ns2/example.bk ns2/example.bk.jnl

diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh
index 3f2a351c125f3ff67bc969747c842fcbee60460d..29a52e5ccf4ef8b288757ee98a303243b5cb93ab 100644 (file)
--- a/bin/tests/system/views/clean.sh
+++ b/bin/tests/system/views/clean.sh
@@ -15,11 +15,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.8 2004/03/05 05:03:43 marka Exp $
+# $Id: clean.sh,v 1.9 2004/03/10 01:06:06 marka Exp $
 
 #
 # Clean up after zone transfer tests.
 #
 
 rm -f ns3/example.bk dig.out.ns2 dig.out.ns3
+rm -f ns2/named.conf ns2/example.db ns3/named.conf ns3/internal.bk
 

diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index 2c165088df6c1e080e72b596b276f35c1c8dccce..e2fd03b1693c3e2ce2939e134ded031a30d7e544 100644 (file)
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -15,9 +15,9 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.7 2004/03/05 05:03:43 marka Exp $
+# $Id: setup.sh,v 1.8 2004/03/10 01:06:06 marka Exp $
 
 
-cp ns2/example1.db ns2/example.db
-cp ns2/named1.conf ns2/named.conf
-cp ns3/named1.conf ns3/named.conf
+cp -f ns2/example1.db ns2/example.db
+cp -f ns2/named1.conf ns2/named.conf
+cp -f ns3/named1.conf ns3/named.conf

diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 6e4f32fed5a3c806d95752125a8a395f28145daf..77e0d2224894d2bf1b57a699251e310896d5f6bb 100644 (file)
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.27 2004/03/05 05:03:43 marka Exp $
+# $Id: tests.sh,v 1.28 2004/03/10 01:06:06 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -34,9 +34,9 @@ grep ";" dig.out.ns3.1        # XXXDCL why is this here?
 
 echo "I:copying in new configurations for ns2 and ns3"
 rm -f ns2/named.conf ns3/named.conf ns2/example.db
-cp ns2/named2.conf ns2/named.conf
-cp ns3/named2.conf ns3/named.conf
-cp ns2/example2.db ns2/example.db
+cp -f ns2/named2.conf ns2/named.conf
+cp -f ns3/named2.conf ns3/named.conf
+cp -f ns2/example2.db ns2/example.db
 
 echo "I:reloading ns2 and ns3 with rndc"
 $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'

diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index 61dfad8d39bdcddf2a4d80122260aaf6eabc31cc..4d72856f7d77552aabba37f54fda97bb15e91c64 100644 (file)
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.9 2004/03/05 05:04:03 marka Exp $
+# $Id: clean.sh,v 1.10 2004/03/10 01:06:06 marka Exp $
 
 #
 # Clean up after zone transfer quota tests.
@@ -23,5 +23,4 @@
 
 rm -f ns1/zone*.example.db ns1/zones.conf
 rm -f ns2/zone*.example.bk ns2/zones.conf
-rm -f dig.out.*
-
+rm -f dig.out.* ns2/changing.bk

diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh
index dc7905fca8ed99e5cd954d82e29e5c193ba9a6b3..ca932b665f3964e77b3e13158531885d20b75bd5 100644 (file)
--- a/bin/tests/system/xferquota/setup.sh
+++ b/bin/tests/system/xferquota/setup.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.12 2004/03/05 05:04:04 marka Exp $
+# $Id: setup.sh,v 1.13 2004/03/10 01:06:06 marka Exp $
 
 #
 # Set up test data for zone transfer quota tests.
@@ -23,4 +23,4 @@
 
 $PERL setup.pl
 
-cp ns1/changing1.db ns1/changing.db
+cp -f ns1/changing1.db ns1/changing.db

diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index 3f04581e886ddaa4d8d61a3d4b653c65813033f1..8b531e76ec79482fdb30110e894ec5192023712d 100644 (file)
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.21 2004/03/05 05:04:04 marka Exp $
+# $Id: tests.sh,v 1.22 2004/03/10 01:06:06 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -29,7 +29,7 @@ ticks=0
 while [ $count != 300 ]; do
         if [ $ticks = 1 ]; then
                echo "I:Changing test zone..."
-               cp ns1/changing2.db ns1/changing.db
+               cp -f ns1/changing2.db ns1/changing.db
                kill -HUP `cat ns1/named.pid`
        fi
        sleep 1