From: Michal Nowak <mnowak@isc.org>
Date: Tue, 16 Feb 2021 10:33:58 +0000 (+0100)
Subject: Prevent Git to expand $systest
X-Git-Tag: v9.17.11~44^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f310b7525031e2017d4d793e9db5cb5a83392851;p=thirdparty%2Fbind9.git

Prevent Git to expand $systest

CentOS 8 "git status" unexpectedly expands search directory "tsig" to
also search in the "tsiggss" directory, thus incorrectly identifying
files as "not removed" in the "tsig" directory:

$ git status -su --ignored tsig
$ touch tsiggss/ns1/{named.run,named.memstats}
$ git status -su --ignored tsig
!! tsiggss/ns1/named.memstats
!! tsiggss/ns1/named.run
---

diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in
index 146b499581c..d3f088dcb51 100644
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -294,7 +294,7 @@ fi
 
 print_outstanding_files() {
     if test -d ${srcdir}/../../../.git; then
-        git status -su --ignored "${systest}" 2>/dev/null | \
+        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'