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 03905e7dd0ccb17e42137b15b3348166e51c721a..a54b7c9565bbf47675d85d40c81d3524f32eb5ee 100644 (file)
--- 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 72d464ace02e9d9e009af2e9795d15533b6f6304..04c24924c73a229018578f1d3e0b40c25f5c7843 100644 (file)
--- 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 {} \;