mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-12 05:30:02 -04:00
Merge branch 'matthijs-more-clean.sh-related-cleanups-v9_11' into 'v9_11'
More clean.sh related cleanups See merge request isc-projects/bind9!1595
This commit is contained in:
commit
ae383b7b52
20 changed files with 75 additions and 95 deletions
|
|
@ -18,7 +18,3 @@ copy_setports ns1/named.conf.in ns1/named.conf
|
|||
copy_setports ns2/named1.conf.in ns2/named.conf
|
||||
cp -f ns2/default.nzf.in ns2/3bf305731dd26307.nzf
|
||||
copy_setports ns3/named1.conf.in ns3/named.conf
|
||||
|
||||
rm -f ns3/*.nzf ns3/*.nzf~
|
||||
rm -f ns3/*.nzd ns3/*.nzd-lock
|
||||
rm -f ns3/inlineslave.db
|
||||
|
|
|
|||
15
bin/tests/system/checkconf/setup.sh
Normal file
15
bin/tests/system/checkconf/setup.sh
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
# shellcheck source=conf.sh
|
||||
. "$SYSTEMTESTTOP/conf.sh"
|
||||
|
||||
$SHELL clean.sh
|
||||
|
|
@ -10,7 +10,8 @@
|
|||
SYSTEMTESTTOP=..
|
||||
. $SYSTEMTESTTOP/conf.sh
|
||||
|
||||
rm -f named-compilezone
|
||||
$SHELL clean.sh
|
||||
|
||||
ln -s $CHECKZONE named-compilezone
|
||||
|
||||
./named-compilezone -D -F raw -o good1.db.raw example \
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ ln -s $CHECKZONE named-compilezone
|
|||
|
||||
# Test 1: KSK goes inactive before successor is active
|
||||
dir=01-ksk-inactive
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -q -K $dir -S $ksk1`
|
||||
|
|
@ -30,8 +28,6 @@ zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
|||
|
||||
# Test 2: ZSK goes inactive before successor is active
|
||||
dir=02-zsk-inactive
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -q -K $dir -S $zsk1`
|
||||
|
|
@ -40,8 +36,6 @@ ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
|||
|
||||
# Test 3: KSK is unpublished before its successor is published
|
||||
dir=03-ksk-unpublished
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -q -K $dir -S $ksk1`
|
||||
|
|
@ -50,8 +44,6 @@ zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
|||
|
||||
# Test 4: ZSK is unpublished before its successor is published
|
||||
dir=04-zsk-unpublished
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -q -K $dir -S $zsk1`
|
||||
|
|
@ -61,8 +53,6 @@ ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
|||
# Test 5: KSK deleted and successor published before KSK is deactivated
|
||||
# and successor activated.
|
||||
dir=05-ksk-unpub-active
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +8mo $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -q -K $dir -S $ksk1`
|
||||
|
|
@ -71,8 +61,6 @@ zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
|||
# Test 6: ZSK deleted and successor published before ZSK is deactivated
|
||||
# and successor activated.
|
||||
dir=06-zsk-unpub-active
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +8mo $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -q -K $dir -S $zsk1`
|
||||
|
|
@ -80,8 +68,6 @@ ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
|||
|
||||
# Test 7: KSK rolled with insufficient delay after prepublication.
|
||||
dir=07-ksk-ttl
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -q -K $dir -S $ksk1`
|
||||
|
|
@ -91,8 +77,6 @@ zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
|||
|
||||
# Test 8: ZSK rolled with insufficient delay after prepublication.
|
||||
dir=08-zsk-ttl
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -q -K $dir -S $zsk1`
|
||||
|
|
@ -102,8 +86,6 @@ ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
|||
|
||||
# Test 9: KSK goes inactive before successor is active, but checking ZSKs
|
||||
dir=09-check-zsk
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -q -K $dir -S $ksk1`
|
||||
|
|
@ -112,8 +94,6 @@ zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
|||
|
||||
# Test 10: ZSK goes inactive before successor is active, but checking KSKs
|
||||
dir=10-check-ksk
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -q -K $dir -S $zsk1`
|
||||
|
|
@ -122,8 +102,6 @@ ksk1=`$KEYGEN -q -K $dir -3fk example.com`
|
|||
|
||||
# Test 11: ZSK goes inactive before successor is active, but after cutoff
|
||||
dir=11-cutoff
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -q -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +18mo -D +2y $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -q -K $dir -S $zsk1`
|
||||
|
|
|
|||
14
bin/tests/system/dialup/clean.sh
Normal file
14
bin/tests/system/dialup/clean.sh
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
rm -f ns2/example.bk
|
||||
rm -f ns3/example.bk
|
||||
rm -f */named.memstats */named.run
|
||||
|
|
@ -7,5 +7,7 @@
|
|||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
rm -f ns2/example.bk
|
||||
rm -f ns3/example.bk
|
||||
# shellcheck source=conf.sh
|
||||
. "$SYSTEMTESTTOP/conf.sh"
|
||||
|
||||
$SHELL clean.sh
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ $SHELL clean.sh
|
|||
test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
|
||||
|
||||
cp ns1/root.db.in ns1/root.db
|
||||
rm -f ns1/root.db.signed
|
||||
|
||||
touch ns2/trusted.conf
|
||||
cp ns2/nsec3-loop.db.in ns2/nsec3-loop.db
|
||||
|
|
@ -26,7 +25,6 @@ cp ns2/bits.db.in ns2/nokeys.db
|
|||
cp ns2/bits.db.in ns2/removedkeys-secondary.db
|
||||
cp ns2/bits.db.in ns2/retransfer.db
|
||||
cp ns2/bits.db.in ns2/retransfer3.db
|
||||
rm -f ns2/bits.db.jnl
|
||||
|
||||
cp ns3/master.db.in ns3/master.db
|
||||
cp ns3/master.db.in ns3/dynamic.db
|
||||
|
|
@ -41,7 +39,6 @@ mkdir ns3/removedkeys
|
|||
|
||||
touch ns4/trusted.conf
|
||||
cp ns4/noixfr.db.in ns4/noixfr.db
|
||||
rm -f ns4/noixfr.db.jnl
|
||||
|
||||
copy_setports ns1/named.conf.in ns1/named.conf
|
||||
copy_setports ns2/named.conf.in ns2/named.conf
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
rm -f ns1/myftp.db
|
||||
rm -f ns1/*.db ns1/*.jnl
|
||||
rm -f ns3/*.jnl ns3/mytest.db ns3/subtest.db
|
||||
rm -f ns4/*.jnl ns4/*.db
|
||||
rm -f */named.memstats
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@ SYSTEMTESTTOP=..
|
|||
|
||||
$SHELL clean.sh
|
||||
|
||||
rm -f ns1/*.db ns1/*.jnl ns3/*.jnl ns4/*.db ns4/*.jnl
|
||||
|
||||
cat <<EOF >ns1/named.conf
|
||||
options {
|
||||
query-source address 10.53.0.1;
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ $SHELL clean.sh
|
|||
# Test 1: KSK goes inactive before successor is active
|
||||
dir=01-ksk-inactive
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -K $dir -S $ksk1`
|
||||
|
|
@ -30,8 +28,6 @@ zsk1=`$KEYGEN -K $dir -3 example.com`
|
|||
# Test 2: ZSK goes inactive before successor is active
|
||||
dir=02-zsk-inactive
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -K $dir -S $zsk1`
|
||||
|
|
@ -41,8 +37,6 @@ ksk1=`$KEYGEN -K $dir -3fk example.com`
|
|||
# Test 3: KSK is unpublished before its successor is published
|
||||
dir=03-ksk-unpublished
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -K $dir -S $ksk1`
|
||||
|
|
@ -52,8 +46,6 @@ zsk1=`$KEYGEN -K $dir -3 example.com`
|
|||
# Test 4: ZSK is unpublished before its successor is published
|
||||
dir=04-zsk-unpublished
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -K $dir -S $zsk1`
|
||||
|
|
@ -64,8 +56,6 @@ ksk1=`$KEYGEN -K $dir -3fk example.com`
|
|||
# and successor activated.
|
||||
dir=05-ksk-unpub-active
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +8mo $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -K $dir -S $ksk1`
|
||||
|
|
@ -75,8 +65,6 @@ zsk1=`$KEYGEN -K $dir -3 example.com`
|
|||
# and successor activated.
|
||||
dir=06-zsk-unpub-active
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +8mo $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -K $dir -S $zsk1`
|
||||
|
|
@ -85,8 +73,6 @@ ksk1=`$KEYGEN -K $dir -3fk example.com`
|
|||
# Test 7: KSK rolled with insufficient delay after prepublication.
|
||||
dir=07-ksk-ttl
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -K $dir -3fk example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
|
||||
ksk2=`$KEYGEN -K $dir -S $ksk1`
|
||||
|
|
@ -96,8 +82,6 @@ zsk1=`$KEYGEN -K $dir -3 example.com`
|
|||
# Test 8: ZSK rolled with insufficient delay after prepublication.
|
||||
dir=08-zsk-ttl
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
zsk1=`$KEYGEN -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
|
||||
zsk2=`$KEYGEN -K $dir -S $zsk1`
|
||||
|
|
@ -106,14 +90,10 @@ $SETTIME -K $dir -P +269d $zsk2 > /dev/null 2>&1
|
|||
ksk1=`$KEYGEN -K $dir -3fk example.com`
|
||||
|
||||
# Test 9: No special preparation needed
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
|
||||
# Test 10: Valid key set, but rollover period has changed
|
||||
dir=10-change-roll
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -K $dir -3fk example.com`
|
||||
zsk1=`$KEYGEN -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I +3mo -D +4mo $zsk1 > /dev/null 2>&1
|
||||
|
|
@ -122,8 +102,6 @@ zsk2=`$KEYGEN -K $dir -S $zsk1`
|
|||
# Test 11: Many keys all simultaneously scheduled to be active in the future
|
||||
dir=11-many-simul
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
k1=`$KEYGEN -K $dir -q3fk -P now+1mo -A now+1mo example.com`
|
||||
z1=`$KEYGEN -K $dir -q3 -P now+1mo -A now+1mo example.com`
|
||||
z2=`$KEYGEN -K $dir -q3 -P now+1mo -A now+1mo example.com`
|
||||
|
|
@ -133,8 +111,6 @@ z4=`$KEYGEN -K $dir -q3 -P now+1mo -A now+1mo example.com`
|
|||
# Test 12: Many keys all simultaneously scheduled to be active in the past
|
||||
dir=12-many-active
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
k1=`$KEYGEN -K $dir -q3fk example.com`
|
||||
z1=`$KEYGEN -K $dir -q3 example.com`
|
||||
z2=`$KEYGEN -K $dir -q3 example.com`
|
||||
|
|
@ -144,8 +120,6 @@ z4=`$KEYGEN -K $dir -q3 example.com`
|
|||
# Test 13: Multiple simultaneous keys with no configured roll period
|
||||
dir=13-noroll
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
k1=`$KEYGEN -K $dir -q3fk example.com`
|
||||
k2=`$KEYGEN -K $dir -q3fk example.com`
|
||||
k3=`$KEYGEN -K $dir -q3fk example.com`
|
||||
|
|
@ -154,8 +128,6 @@ z1=`$KEYGEN -K $dir -q3 example.com`
|
|||
# Test 14: Keys exist but have the wrong algorithm
|
||||
dir=14-wrongalg
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
k1=`$KEYGEN -K $dir -qfk example.com`
|
||||
z1=`$KEYGEN -K $dir -q example.com`
|
||||
$SETTIME -K $dir -I now+6mo -D now+8mo $z1 > /dev/null
|
||||
|
|
@ -168,8 +140,6 @@ z4=`$KEYGEN -K $dir -q -S ${z3}.key`
|
|||
# Test 15: No zones specified; just search the directory for keys
|
||||
dir=15-unspec
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
k1=`$KEYGEN -K $dir -q3fk example.com`
|
||||
z1=`$KEYGEN -K $dir -q3 example.com`
|
||||
$SETTIME -K $dir -I now+6mo -D now+8mo $z1 > /dev/null
|
||||
|
|
@ -183,8 +153,6 @@ z4=`$KEYGEN -K $dir -q -S ${z3}.key`
|
|||
# keys have the wrong algorithm for their policies
|
||||
dir=16-wrongalg-unspec
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
k1=`$KEYGEN -K $dir -qfk example.com`
|
||||
z1=`$KEYGEN -K $dir -q example.com`
|
||||
$SETTIME -K $dir -I now+6mo -D now+8mo $z1 > /dev/null
|
||||
|
|
@ -198,8 +166,6 @@ z4=`$KEYGEN -K $dir -q -S ${z3}.key`
|
|||
# flag (this should fail)
|
||||
dir=17-noforce
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
k1=`$KEYGEN -K $dir -q3fk example.com`
|
||||
z1=`$KEYGEN -K $dir -q3 example.com`
|
||||
z2=`$KEYGEN -K $dir -q3 example.com`
|
||||
|
|
@ -209,8 +175,6 @@ z4=`$KEYGEN -K $dir -q3 example.com`
|
|||
# Test 18: Prepublication interval is set to a nonstandard value
|
||||
dir=18-nonstd-prepub
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -K $dir -3fk example.com`
|
||||
zsk1=`$KEYGEN -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -I now+2mo -D now+3mo $zsk1 > /dev/null
|
||||
|
|
@ -218,8 +182,6 @@ $SETTIME -K $dir -I now+2mo -D now+3mo $zsk1 > /dev/null
|
|||
# Test 19: Key has been published/active a long time
|
||||
dir=19-old-keys
|
||||
echo_i "set up $dir"
|
||||
rm -f $dir/K*.key
|
||||
rm -f $dir/K*.private
|
||||
ksk1=`$KEYGEN -K $dir -3fk example.com`
|
||||
zsk1=`$KEYGEN -K $dir -3 example.com`
|
||||
$SETTIME -K $dir -P now-2y -A now-2y $ksk1 > /dev/null
|
||||
|
|
|
|||
15
bin/tests/system/lwresd/setup.sh
Normal file
15
bin/tests/system/lwresd/setup.sh
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
# shellcheck source=conf.sh
|
||||
. "$SYSTEMTESTTOP/conf.sh"
|
||||
|
||||
$SHELL clean.sh
|
||||
|
|
@ -20,7 +20,6 @@ copy_setports ns1/named.conf.in ns1/named.conf
|
|||
copy_setports ns2/named.conf.in ns2/named.conf
|
||||
copy_setports ns3/named.conf.in ns3/named.conf
|
||||
|
||||
rm -f ns1/example.db.raw
|
||||
cp ns1/example.db ns2/
|
||||
cp ns2/formerly-text.db.in ns2/formerly-text.db
|
||||
cp ns1/large.db.in ns1/large.db
|
||||
|
|
|
|||
|
|
@ -14,7 +14,11 @@ SYSTEMTESTTOP=..
|
|||
|
||||
test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
|
||||
|
||||
#
|
||||
# jnl and database files MUST be removed before we start
|
||||
#
|
||||
$SHELL clean.sh
|
||||
|
||||
copy_setports ns1/named.conf.in ns1/named.conf
|
||||
copy_setports ns2/named.conf.in ns2/named.conf
|
||||
copy_setports ns3/named.conf.in ns3/named.conf
|
||||
|
|
@ -27,15 +31,6 @@ copy_setports ns10/named.conf.in ns10/named.conf
|
|||
|
||||
copy_setports verylarge.in verylarge
|
||||
|
||||
#
|
||||
# jnl and database files MUST be removed before we start
|
||||
#
|
||||
|
||||
rm -f ns1/*.jnl ns1/example.db ns2/*.jnl ns2/example.bk
|
||||
rm -f ns2/update.bk ns2/update.alt.bk
|
||||
rm -f ns3/example.db.jnl
|
||||
rm -f ns3/too-big.test.db.jnl
|
||||
|
||||
cp -f ns1/example1.db ns1/example.db
|
||||
sed 's/example.nil/other.nil/g' ns1/example1.db > ns1/other.db
|
||||
sed 's/example.nil/unixtime.nil/g' ns1/example1.db > ns1/unixtime.db
|
||||
|
|
@ -73,7 +68,6 @@ $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha512 -k sha512-key -z keytests.nil > ns1/
|
|||
(cd ns3; $SHELL -e sign.sh)
|
||||
|
||||
cp -f ns1/many.test.db.in ns1/many.test.db
|
||||
rm -f ns1/many.test.db.jnl
|
||||
|
||||
cp ns1/sample.db.in ns1/sample.db
|
||||
cp ns2/sample.db.in ns2/sample.db
|
||||
|
|
|
|||
15
bin/tests/system/rrchecker/setup.sh
Normal file
15
bin/tests/system/rrchecker/setup.sh
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
# shellcheck source=conf.sh
|
||||
. "$SYSTEMTESTTOP/conf.sh"
|
||||
|
||||
$SHELL clean.sh
|
||||
|
|
@ -21,8 +21,6 @@ sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' tmp > ns2
|
|||
copy_setports ns3/named.conf.in tmp
|
||||
sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.signed"; };/' tmp > ns3/named.conf
|
||||
|
||||
rm -f tmp
|
||||
|
||||
copy_setports ns4/named.conf.in ns4/named.conf
|
||||
|
||||
test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
|
||||
|
|
|
|||
|
|
@ -32,5 +32,4 @@ then
|
|||
echo $keyname > keyname
|
||||
else
|
||||
cat ns1/example1.db > ns1/example2.db
|
||||
rm -f keyname
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -17,12 +17,6 @@ $SHELL clean.sh
|
|||
test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
|
||||
|
||||
cp -f ns2/example1.db ns2/example.db
|
||||
rm -f ns2/external/K*
|
||||
rm -f ns2/external/inline.db.signed
|
||||
rm -f ns2/external/inline.db.signed.jnl
|
||||
rm -f ns2/internal/K*
|
||||
rm -f ns2/internal/inline.db.signed
|
||||
rm -f ns2/internal/inline.db.signed.jnl
|
||||
|
||||
copy_setports ns1/named.conf.in ns1/named.conf
|
||||
copy_setports ns2/named1.conf.in ns2/named.conf
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ rm -f ns1/edns-expire.db
|
|||
rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl
|
||||
rm -f ns3/example.bk ns3/tsigzone.bk ns3/example.bk.jnl
|
||||
rm -f ns3/master.bk ns3/master.bk.jnl
|
||||
rm -f ns4/nil.db ns4/root.db
|
||||
rm -f ns4/*.db ns4/*.jnl
|
||||
rm -f ns6/*.db ns6/*.bk ns6/*.jnl
|
||||
rm -f ns7/*.db ns7/*.bk ns7/*.jnl
|
||||
rm -f ns8/large.db ns8/small.db
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ $SHELL ../genzone.sh 2 3 >ns2/tsigzone.db
|
|||
$SHELL ../genzone.sh 6 3 >ns6/master.db
|
||||
$SHELL ../genzone.sh 7 >ns7/master2.db
|
||||
|
||||
rm -f ns4/*.db ns4/*.jnl
|
||||
cp -f ns4/root.db.in ns4/root.db
|
||||
$PERL -e 'for ($i=0;$i<10000;$i++){ printf("x%u 0 in a 10.53.0.1\n", $i);}' >> ns4/root.db
|
||||
|
||||
|
|
|
|||
|
|
@ -809,6 +809,7 @@
|
|||
./bin/tests/system/checkconf/notify.conf CONF-C 2014,2016,2018,2019
|
||||
./bin/tests/system/checkconf/portrange-good.conf CONF-C 2015,2016,2018,2019
|
||||
./bin/tests/system/checkconf/range.conf CONF-C 2013,2016,2018,2019
|
||||
./bin/tests/system/checkconf/setup.sh SH 2019
|
||||
./bin/tests/system/checkconf/shared.example.db ZONE 2015,2016,2018,2019
|
||||
./bin/tests/system/checkconf/tests.sh SH 2005,2007,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019
|
||||
./bin/tests/system/checkconf/view-class-any1.conf CONF-C 2016,2018,2019
|
||||
|
|
@ -972,6 +973,7 @@
|
|||
./bin/tests/system/delzone/ns2/normal.db ZONE 2016,2018,2019
|
||||
./bin/tests/system/delzone/setup.sh SH 2016,2018,2019
|
||||
./bin/tests/system/delzone/tests.sh SH 2016,2018,2019
|
||||
./bin/tests/system/dialup/clean.sh SH 2019
|
||||
./bin/tests/system/dialup/ns1/example.db ZONE 2000,2001,2004,2007,2016,2018,2019
|
||||
./bin/tests/system/dialup/ns1/named.conf CONF-C 2000,2001,2004,2007,2016,2018,2019
|
||||
./bin/tests/system/dialup/ns1/root.db ZONE 2000,2001,2004,2007,2016,2018,2019
|
||||
|
|
@ -1639,6 +1641,7 @@
|
|||
./bin/tests/system/lwresd/ns1/named.conf CONF-C 2000,2001,2004,2006,2007,2008,2016,2018,2019
|
||||
./bin/tests/system/lwresd/ns1/root.db ZONE 2000,2001,2004,2007,2016,2018,2019
|
||||
./bin/tests/system/lwresd/resolv.conf CONF-SH 2000,2001,2004,2007,2012,2016,2018,2019
|
||||
./bin/tests/system/lwresd/setup.sh SH 2019
|
||||
./bin/tests/system/lwresd/tests.sh SH 2000,2001,2004,2007,2011,2012,2013,2014,2016,2018,2019
|
||||
./bin/tests/system/masterfile/clean.sh SH 2001,2004,2007,2010,2012,2014,2015,2016,2018,2019
|
||||
./bin/tests/system/masterfile/knowngood.dig.out X 2001,2004,2012,2018,2019
|
||||
|
|
@ -2017,6 +2020,7 @@
|
|||
./bin/tests/system/rrchecker/classlist.good X 2013,2018,2019
|
||||
./bin/tests/system/rrchecker/clean.sh SH 2013,2014,2016,2017,2018,2019
|
||||
./bin/tests/system/rrchecker/privatelist.good X 2013,2018,2019
|
||||
./bin/tests/system/rrchecker/setup.sh SH 2019
|
||||
./bin/tests/system/rrchecker/tests.sh SH 2013,2014,2015,2016,2017,2018,2019
|
||||
./bin/tests/system/rrchecker/typelist.good X 2013,2014,2015,2016,2017,2018,2019
|
||||
./bin/tests/system/rrl/broken.conf CONF-C 2016,2018,2019
|
||||
|
|
|
|||
Loading…
Reference in a new issue