Create test directories in testdir and remove it on “make clean”

diff --git a/.gitignore b/.gitignore
index 2601d2dc854e14179d4662bdf87c25da60f18040..4ccbc98cbf124319c31e4f1721386cb37ab167ed 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,8 @@
 .DS_Store
 .deps
 ccache-*.tar.*
-perfdir.*
-testdir.*
+perfdir.*/
+testdir/
 
 # version.cpp is generated in src because it should be included into source
 # packages

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d3e3b1824033cce7afc9931a6afe311e7b40834a..04e5f137f2f82b53c8b55d17e8fd61f372bc0112 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,6 +24,15 @@ function(addtest name)
 
 endfunction()
 
+if(${CMAKE_VERSION} VERSION_LESS "3.15")
+  set(clean_files_prop_name ADDITIONAL_MAKE_CLEAN_FILES)
+else()
+  set(clean_files_prop_name ADDITIONAL_CLEAN_FILES)
+endif()
+set_property(
+  DIRECTORY PROPERTY
+  ${clean_files_prop_name} "${CMAKE_BINARY_DIR}/testdir")
+
 addtest(base)
 addtest(nocpp2)
 addtest(cpp1)

diff --git a/test/run b/test/run
index 672299d7eb9b52012790fff7e951fe96c76558d6..469a831742a2652ec82b4585e3d2a01e4c2ad53d 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -488,11 +488,11 @@ done
 
 # ---------------------------------------
 
-TESTDIR=testdir.$$
-TEST_FAILED_SYMLINK=testdir.failed
+TESTDIR=testdir/$$
+TEST_FAILED_SYMLINK=testdir/failed
 ABS_TESTDIR=$PWD/$TESTDIR
 rm -rf $TESTDIR
-mkdir $TESTDIR
+mkdir -p $TESTDIR
 
 START_PWD="$PWD"
 symlink_testdir_on_failure() {