Merge branch '3069-increase-dig-timeout-in-resolver-test' into 'main'

Make resolver system test shellcheck clean

Closes #3069

See merge request isc-projects/bind9!5719

bin/tests/system/resolver/clean.sh

@@ -14,11 +14,11 @@
 #
 # Clean up after resolver tests.
 #
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run */named.run.prev
-rm -f */ans.run
-rm -f */*.jdb
+rm -f ./*/named.conf
+rm -f ./*/named.memstats
+rm -f ./*/named.run ./*/named.run.prev
+rm -f ./*/ans.run
+rm -f ./*/*.jdb
 rm -f dig.out dig.out.* dig.*.out.*
 rm -f dig.*.foo.*
 rm -f dig.*.bar.*

bin/tests/system/resolver/setup.sh

@@ -11,6 +11,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+# shellcheck source=../conf.sh
 . ../conf.sh
 
 cp ns4/tld1.db ns4/tld.db