Commit aad10dd5 authored by Witold Krecicki's avatar Witold Krecicki

Fix merge error in bin/tests/system/conf.sh.in, add missing cleanups in tests

parent 0408ceba
......@@ -50,6 +50,6 @@ rm -f ns3/ttl*.db
rm -f nsupdate.out
rm -f signing.out.*
rm -f settime.out.*
rm -f ns3/*.nzd ns3/*.nzf
rm -f ns3/*.nzd ns3/*.nzd-lock ns3/*.nzf
rm -f digcomp.out.test*
rm -f ns*/named.lock
......@@ -17,3 +17,4 @@ rm -f ns3/dom{13,14}.example.db
rm -f nsupdate.out.*
rm -f ns{1,2,3}/catalog{1,2,3,4}.example.db
rm -rf ns2/zonedir
rm -f ns*/*.nzd ns*/*.nzd-lock
......@@ -59,22 +59,18 @@ RANDFILE=$TOP/bin/tests/system/random.data
# The "stress" test is not run by default since it creates enough
# load on the machine to make it unusable to other users.
# v6synth
SUBDIRS="acl additional allow_query addzone autosign builtin
cacheclean case catz checkconf @CHECKDS@ checknames checkzone
cookie @COVERAGE@ database digdelv dlv dlvauto dlz dlzexternal
dname dns64 dnssec dsdigest dscp @DNSTAP@ dyndb ecdsa ednscompliance
emptyzones fetchlimit filter-aaaa formerr forward geoip glue gost
ixfr inline @KEYMGR@ legacy limits logfileconfig lwresd masterfile
masterformat metadata mkeys names notify nslookup nsupdate nzf2nzd
dname dns64 dnssec dsdigest dscp ecdsa ednscompliance
emptyzones filter-aaaa formerr forward geoip glue gost
ixfr inline legacy limits logfileconfig lwresd masterfile
masterformat metadata mkeys notify nslookup nsupdate nzf2nzd
pending pipelined @PKCS11_TEST@ reclimit redirect resolver rndc
rpz rpzrecurse rrl rrchecker rrsetorder rsabigexponent
runtime sfcache smartsign sortlist spf staticstub statistics
statschannel stub tcp tkey tsig tsiggss unknown upforwd verify views
wildcard xfer xferquota zero zonechecks"
SUBDIRS="acl additional addzone allow_query autosign builtin cacheclean case
catz checkconf @CHECKDS@ checknames checkzone cookie @COVERAGE@
database digdelv dlv dlvauto dlz dlzexternal dname dns64 dnssec
@DNSTAP@ dscp dsdigest dyndb ecdsa ednscompliance emptyzones
fetchlimit filter-aaaa formerr forward geoip glue gost inline ixfr
@KEYMGR@ legacy limits logfileconfig lwresd masterfile masterformat
metadata mkeys names notify nslookup nsupdate nzf2nzd pending
pipelined @PKCS11_TEST@ reclimit redirect resolver rndc rpz
rpzrecurse rrchecker rrl rrsetorder rsabigexponent runtime sfcache
smartsign sortlist spf staticstub statistics statschannel stub tcp
tkey tsig tsiggss unknown upforwd verify views wildcard xfer
xferquota zero zonechecks"
# Use the CONFIG_SHELL detected by configure for tests
SHELL=@SHELL@
......
......@@ -73,7 +73,7 @@ rm -f dig.out.ns*
rm -f signing.out*
rm -f freeze.test*
rm -f thaw.test*
rm -f */*.nzd */*.nzf
rm -f */*.nzd */*.nzd-lock */*.nzf
rm -f ns3/test-?.bk
rm -f ns3/test-?.bk.signed
rm -f ns3/test-?.bk.signed.jnl
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment