Merge branch 'mnowak/system-test-check-for-file-not-removed' into 'main'

Check for "file not removed" in system test output

See merge request isc-projects/bind9!4680

.gitlab-ci.yml

@@ -311,6 +311,7 @@ stages:
   script:
     - cd bin/tests/system
     - make -j${TEST_PARALLEL_JOBS:-1} -k check V=1
+    - if git rev-parse > /dev/null 2>&1; then ( ! grep "^I:.*:file.*not removed$" *.log ); fi
   after_script:
     - test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
     - test -d bind-* && cd bind-*

bin/tests/system/dnssec/clean.sh

@@ -35,6 +35,7 @@ rm -f ./ns*/managed-keys.bind* ./ns*/*.mkeys*
 rm -f ./ns*/named.lock
 rm -f ./ns1/managed.key.id
 rm -f ./ns1/root.db ./ns2/example.db ./ns2/managed.db ./ns2/trusted.db
+rm -f ./ns1/trusted.keys
 rm -f ./ns2/algroll.db
 rm -f ./ns2/badparam.db ./ns2/badparam.db.bad
 rm -f ./ns2/cdnskey-kskonly.secure.db

bin/tests/system/mirror/clean.sh

@@ -18,6 +18,7 @@ rm -f */K*
 rm -f */db-*
 rm -f */dsset-*
 rm -f */jn-*
+rm -f */_default.nzf
 rm -f */managed-keys.bind*
 rm -f */named.memstats
 rm -f */named.run

bin/tests/system/rpzextra/clean.sh

@@ -15,3 +15,4 @@ rm -f ns*/named.run
 rm -f ns*/rpz*.txt
 rm -rf __pycache__
 rm -f *.status
+rm -rf .cache

bin/tests/system/rpzrecurse/clean.sh

@@ -23,6 +23,7 @@ rm -f ns2/named.[0-9]*.conf
 rm -f ns2/named.conf.header
 
 rm -f ns3/named.conf
+rm -f ns3/named.run.prev
 
 rm -f dnsrps*.conf dnsrpzd*
 rm -f ns*/session.key

bin/tests/system/run.sh.in

@@ -92,7 +92,7 @@ if [ "${srcdir}" != "${builddir}" ]; then
         cp -a "${srcdir}/common" "${builddir}"
     fi
     # Some tests require additional files to work for out-of-tree test runs.
-    for file in ckdnsrps.sh digcomp.pl ditch.pl packet.pl start.pl stop.pl; do
+    for file in ckdnsrps.sh digcomp.pl ditch.pl packet.pl start.pl stop.pl testcrypto.sh; do
         if [ ! -r "${file}" ]; then
             cp -a "${srcdir}/${file}" "${builddir}"
         fi
@@ -294,10 +294,10 @@ fi
 
 print_outstanding_files() {
     if test -d ${srcdir}/../../../.git; then
-        git status -su --ignored "${systest}" 2>/dev/null | \
-        sed -n -e 's|^?? \(.*\)|I:file \1 not removed|p' \
-            -e 's|^!! \(.*/named.run\)$|I:file \1 not removed|p' \
-            -e 's|^!! \(.*/named.memstats\)$|I:file \1 not removed|p'
+        git status -su --ignored "${systest}/" 2>/dev/null | \
+        sed -n -e 's|^?? \(.*\)|I:'${systest}':file \1 not removed|p' \
+            -e 's|^!! \(.*/named.run\)$|I:'${systest}':file \1 not removed|p' \
+            -e 's|^!! \(.*/named.memstats\)$|I:'${systest}':file \1 not removed|p'
     fi
 }
 

bin/tests/system/shutdown/clean.sh

@@ -15,3 +15,4 @@ rm -f */named.conf
 rm -f */named.run
 rm -rf __pycache__
 rm -f *.status
+rm -rf .cache

bin/tests/system/tkey/clean.sh

@@ -18,6 +18,7 @@ rm -f ns*/K*
 rm -f ns*/_default.tsigkeys
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
+rm -f ns*/named.conf-e
 rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run