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

                        [RT #10461]

diff --git a/CHANGES b/CHANGES
index daacb76a0eb3581dd275398ea25ba31bba7ff935..64972022b5b6db997b86286d3e7e40d11b1f3ca8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@
 
                        NOTE: allow-v6-synthesis has been deprecated.
 
+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 461fb5bd82be9d8afa7636de2850c22fee3e5435..57467c1b67c2a3a526ea457ca84c113205e508e0 100644 (file)
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/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.10.2.1 2004/03/09 06:09:50 marka Exp $
+# $Id: clean.sh,v 1.10.2.2 2004/03/10 01:05:02 marka Exp $
 
 rm -f */K* */keyset-* */signedkey-* */*.signed */trusted.conf
 rm -f ns1/root.db ns2/example.db ns3/secure.example.db
 rm -f ns3/unsecure.example.db ns3/bogus.example.db
+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 1c84dfc6f0ddb4161a6f657c47190c49a29eabf1..2ae3698f7b9cdf2698e5b86816fa62c6cee6195b 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.10.2.1 2004/03/09 06:09:50 marka Exp $
+# $Id: setup.sh,v 1.10.2.2 2004/03/10 01:05:02 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 f5a7607725ff519b456092c2fde414764c9c8cb4..1279bd6b86e7ca6b4851d6b7b8cb205a5b2200b8 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.2.2.1 2004/03/09 06:09:55 marka Exp $
+# $Id: setup.sh,v 1.2.2.2 2004/03/10 01:05:03 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 7ca8b80b28ad583db1c13e68970678e03352f524..c0b0e81cce19b1076889e0470e172c1541b62a5a 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.7.2.1 2004/03/09 06:10:02 marka Exp $
+# $Id: clean.sh,v 1.7.2.2 2004/03/10 01:05:03 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 6ea9ae663466acba2acfc6f1f3cb8c9a01b7f73f..62af36b65584c21689621794787024a1ea3e765e 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.6.2.1 2004/03/09 06:10:03 marka Exp $
+# $Id: setup.sh,v 1.6.2.2 2004/03/10 01:05:03 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 475ce23f5f9d8281b729e33f6323424925bd58bf..a39e2d0fba0cb1bae48a88ed8eba3b8aa95368b7 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.29.2.1 2004/03/09 06:10:03 marka Exp $
+# $Id: tests.sh,v 1.29.2.2 2004/03/10 01:05:03 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 2a5fdd47cf8168f6b42f50b1211b9fae1cfe37a2..28b55813b583c97ede00ee2618c8389849b5ee39 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.7.2.1 2004/03/09 06:10:05 marka Exp $
+# $Id: clean.sh,v 1.7.2.2 2004/03/10 01:05:04 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 adafac3955ad30e2b23dcec42bee04040387c5f1..88faf6806862233033bd02ecd9e6bc704f84f3d9 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.6.2.1 2004/03/09 06:10:05 marka Exp $
+# $Id: setup.sh,v 1.6.2.2 2004/03/10 01:05:04 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 3f855af3aa6e15d6c1159662585f43a863912a30..e117d91a4026f0dca244572fb6a38502dcf41509 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.2.2.1 2004/03/09 06:10:07 marka Exp $
+# $Id: setup.sh,v 1.2.2.2 2004/03/10 01:05: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 c69ff206df8184c3b2be47c59b17b8a81ff8d1c4..c320916eaf5b43871b2707de0f60b801f6debdc0 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.3.2.1 2004/03/09 06:10:07 marka Exp $
+# $Id: tests.sh,v 1.3.2.2 2004/03/10 01:05: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 573080cf99aee6e6eb589679c4e6ff2b6f2555f4..76f9b369d522f8e712c3ab95a53130173e7d10a2 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.4.2.1 2004/03/09 06:10:21 marka Exp $
+# $Id: setup.sh,v 1.4.2.2 2004/03/10 01:05: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 9012efcdee62b73f38f833cb955dd61a149ea597..eab85b1235601c82307def0e0f938653fb574b0c 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.7.2.1 2004/03/09 06:10:24 marka Exp $
+# $Id: clean.sh,v 1.7.2.2 2004/03/10 01:05: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 c1ad57e67cc8797a091dd0808f82e3bb99b46ae6..1eb59a9e1686a58417a6eb7713e52cb2db984e09 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.6.2.1 2004/03/09 06:10:24 marka Exp $
+# $Id: setup.sh,v 1.6.2.2 2004/03/10 01:05: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 d1083c97fe353ebc6f32c0d292c0bc53ba7be177..707d32de518735d6dadfd337f4d1a1192b1e66a6 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.26.2.1 2004/03/09 06:10:24 marka Exp $
+# $Id: tests.sh,v 1.26.2.2 2004/03/10 01:05: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 d30d335acfcaf9d682b1f161e36827942917ecb5..158d59b97ddb75cb9b05ef7b7476ce22fe3bb21c 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.8.2.1 2004/03/09 06:10:28 marka Exp $
+# $Id: clean.sh,v 1.8.2.2 2004/03/10 01:05: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 5fc856f77d5e876252f75c44dc070cd73e720fe0..9e574169d2092dd37aa21b1ff4341147e51608b0 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.11.2.1 2004/03/09 06:10:29 marka Exp $
+# $Id: setup.sh,v 1.11.2.2 2004/03/10 01:05: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 023eff3a0c4f0d729af596eb5387aa223ec08c57..2e6b4ed14fd5dbdb14003ac338bd4ae31d428fdb 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.20.2.1 2004/03/09 06:10:29 marka Exp $
+# $Id: tests.sh,v 1.20.2.2 2004/03/10 01:05: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