mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Merge branch 'tkrizek/checkconf-keys-dir-set-e' into 'main'

Browse Source 
Clean up keys directory in checkconf test

See merge request isc-projects/bind9!8133
This commit is contained in:
Tom Krizek
2023-07-25 07:20:31 +00:00
parent 539a4581ea 062dfac28e
commit ae179921e0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/tests/system/checkconf/clean.sh
View File

@@ -22,5 +22,6 @@ rm -f diff.out*
rm -f good-kasp.conf.in rm -f good-kasp.conf.in
rm -f good-server-christmas-tree.conf rm -f good-server-christmas-tree.conf
rm -f good.conf good.conf.raw good.conf.out badzero.conf *.out rm -f good.conf good.conf.raw good.conf.out badzero.conf *.out
rm -rf keys
rm -f ns*/named.lock rm -f ns*/named.lock
rm -rf test.keydir rm -rf test.keydir

4
bin/tests/system/checkconf/tests.sh
View File

@@ -18,7 +18,7 @@ set -e
status=0 status=0
n=0 n=0
mkdir keys mkdir -p keys
n=$((n + 1)) n=$((n + 1))
echo_i "checking that named-checkconf handles a known good config ($n)" echo_i "checking that named-checkconf handles a known good config ($n)"
@@ -619,7 +619,5 @@ grep -F "warning: ownername 'foo.*.check-wildcard' contains an non-terminal wild
if [ $ret != 0 ]; then echo_i "failed"; ret=1; fi if [ $ret != 0 ]; then echo_i "failed"; ret=1; fi
status=$((status + ret)) status=$((status + ret))
rmdir keys
echo_i "exit status: $status" echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1 [ $status -eq 0 ] || exit 1