From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 18 Sep 2023 15:20:01 +0000 (+0200)
Subject: Treat bin/tests/system/_common as non-temp directory
X-Git-Tag: v9.19.18~80^2~3
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9e13c3dbcb148db3cf72b758ece77d3a7ece81f7;p=thirdparty%2Fbind9.git

Treat bin/tests/system/_common as non-temp directory

The _common directory is a special case directory which contains shared
files for other system test directories. Make sure it's tracked in git
and not deleted during temporary directory cleanup.
---

diff --git a/bin/tests/system/.gitignore b/bin/tests/system/.gitignore
index e2daf1cef5e..d26b4b0d3d3 100644
--- a/bin/tests/system/.gitignore
+++ b/bin/tests/system/.gitignore
@@ -26,3 +26,4 @@ named.run
 /*_*
 !/*_*.py
 !/*_*.sh
+!/_common
diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 44282372de6..3607451e4ec 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -240,4 +240,4 @@ $(TESTS): legacy.run.sh
 test-local: check
 
 clean-local::
-	-find $(builddir) -maxdepth 1 -type d -name "*_*" | xargs rm -rf
+	-find -L . -mindepth 1 -maxdepth 1 -type d -name "*_*" -and -not -name "_common" -exec rm -rf {} \;