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.18.20~46^2~2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=09a8dd2f5b3ee3e9b3dde411fe08190b2b881c46;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.

(cherry picked from commit 9e13c3dbcb148db3cf72b758ece77d3a7ece81f7)
---

diff --git a/bin/tests/system/.gitignore b/bin/tests/system/.gitignore
index 03905e7dd0c..a54b7c9565b 100644
--- a/bin/tests/system/.gitignore
+++ b/bin/tests/system/.gitignore
@@ -29,3 +29,4 @@ parallel.mk
 /*_*
 !/*_*.py
 !/*_*.sh
+!/_common
diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 72d464ace02..04c24924c73 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -255,4 +255,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 {} \;