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 e2daf1cef5e63f7f055f7c9c195b397911dbfadd..d26b4b0d3d37327a9772b13bb54618fdeff792b6 100644 (file)
--- 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 44282372de6b39f7fdda9333c62520c9f536cace..3607451e4ec06880d05ebd755f8d9d79909239e4 100644 (file)
--- 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 {} \;