tests: Use unique name for TEST_PATH

We had a cases in patch where two tests were using the same TEST_PATH
and therefore they were stepping each other to the same files
which caused failures. These failures are not easy to reproduce.

This patch uses macro BASE_FILE_STEM for unique name. It should prevent
copy&paste problem resulting to intermittent failures.

@see also
https://www.gnu.org/software/make/manual/html_node/Automatic-Variables.html

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>

20 files changed, 22 insertions, 20 deletions

diff --git a/Makefile.am b/Makefile.am
index dc0670a5c..ff3434301 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -433,7 +433,9 @@ AM_CPPFLAGS = \
     -DSSS_SUDO_SOCKET_NAME=\"$(pipepath)/sudo\" \
     -DSSS_AUTOFS_SOCKET_NAME=\"$(pipepath)/autofs\" \
     -DSSS_SSH_SOCKET_NAME=\"$(pipepath)/ssh\" \
-    -DLOCALEDIR=\"$(localedir)\"
+    -DLOCALEDIR=\"$(localedir)\" \
+    -DBASE_FILE_STEM=\"$(*F)\" \
+    $(NULL)
 
 EXTRA_DIST =
 
diff --git a/src/tests/auth-tests.c b/src/tests/auth-tests.c
index 670a4d2ad..fda8931ae 100644
--- a/src/tests/auth-tests.c
+++ b/src/tests/auth-tests.c
@@ -39,7 +39,7 @@
 #include "db/sysdb.h"
 #include "tests/common.h"
 
-#define TESTS_PATH "tests_auth"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_FILE "tests_conf.ldb"
 
 struct sysdb_test_ctx {
diff --git a/src/tests/cmocka/test_dp_opts.c b/src/tests/cmocka/test_dp_opts.c
index 9d4d4720c..2d1646688 100644
--- a/src/tests/cmocka/test_dp_opts.c
+++ b/src/tests/cmocka/test_dp_opts.c
@@ -30,7 +30,7 @@
 #define BLOB_DEFAULT    "blobval"
 #define INT_DEFAULT     123
 
-#define TESTS_PATH "tests_opts"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_opt_conf.ldb"
 #define TEST_DOM_NAME "opt_test"
 #define TEST_ID_PROVIDER "ldap"
diff --git a/src/tests/cmocka/test_dyndns.c b/src/tests/cmocka/test_dyndns.c
index 22526e532..bed7565f4 100644
--- a/src/tests/cmocka/test_dyndns.c
+++ b/src/tests/cmocka/test_dyndns.c
@@ -36,7 +36,7 @@
 #include "tests/cmocka/common_mock_be.h"
 #include "src/providers/dp_dyndns.h"
 
-#define TESTS_PATH "tests_dyndns"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_dyndns_conf.ldb"
 #define TEST_DOM_NAME "dyndns_test"
 #define TEST_ID_PROVIDER "ldap"
diff --git a/src/tests/cmocka/test_io.c b/src/tests/cmocka/test_io.c
index 9bdb7107e..8d29a05cd 100644
--- a/src/tests/cmocka/test_io.c
+++ b/src/tests/cmocka/test_io.c
@@ -40,7 +40,7 @@
 #include "util/util.h"
 #include "tests/common.h"
 
-#define TESTS_PATH "tests_io"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define FILE_TEMPLATE TESTS_PATH"/test_io.XXXXXX"
 #define NON_EX_PATH TESTS_PATH"/non-existent-path"
 
diff --git a/src/tests/cmocka/test_ipa_subdomains_server.c b/src/tests/cmocka/test_ipa_subdomains_server.c
index fb9bd80e2..fc9a73cf6 100644
--- a/src/tests/cmocka/test_ipa_subdomains_server.c
+++ b/src/tests/cmocka/test_ipa_subdomains_server.c
@@ -57,7 +57,7 @@
 #define CHILD_FLAT  "CHILD"
 #define CHILD_SID   "S-1-2-3-4"
 
-#define TESTS_PATH "tests_ipa_subdom_server"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_ipa_subdom_server.ldb"
 #define TEST_DOM_NAME "ipa_subdom_server_test"
 #define TEST_ID_PROVIDER "ipa"
diff --git a/src/tests/cmocka/test_ldap_id_cleanup.c b/src/tests/cmocka/test_ldap_id_cleanup.c
index 8dde69e67..e4c277fa8 100644
--- a/src/tests/cmocka/test_ldap_id_cleanup.c
+++ b/src/tests/cmocka/test_ldap_id_cleanup.c
@@ -36,7 +36,7 @@
 #include "providers/ldap/ldap_opts.h"
 #include "providers/ipa/ipa_opts.h"
 
-#define TESTS_PATH "tests_ldap_id_cleanup"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_FILE "tests_conf.ldb"
 
 struct sysdb_test_ctx {
diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c
index a1f947185..274e1543c 100644
--- a/src/tests/cmocka/test_negcache.c
+++ b/src/tests/cmocka/test_negcache.c
@@ -50,7 +50,7 @@
 #define LIFETIME 200
 #define SHORTSPAN 1
 #define NAME "foo_name"
-#define TESTS_PATH "tests_ncache"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_nss_conf.ldb"
 #define TEST_DOM_NAME "nss_test"
 #define TEST_ID_PROVIDER "ldap"
diff --git a/src/tests/cmocka/test_nested_groups.c b/src/tests/cmocka/test_nested_groups.c
index 8081ff261..dc29768c5 100644
--- a/src/tests/cmocka/test_nested_groups.c
+++ b/src/tests/cmocka/test_nested_groups.c
@@ -32,7 +32,7 @@
 #include "providers/ldap/sdap_idmap.h"
 #include "providers/ldap/sdap_async_private.h"
 
-#define TESTS_PATH "tests_ldap_nested_groups"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_ldap_nested_groups_conf.ldb"
 #define TEST_DOM_NAME "ldap_nested_groups_test"
 #define TEST_ID_PROVIDER "ldap"
diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c
index eb273b226..6bfbd574a 100644
--- a/src/tests/cmocka/test_nss_srv.c
+++ b/src/tests/cmocka/test_nss_srv.c
@@ -34,7 +34,7 @@
 #include "util/util_sss_idmap.h"
 #include "db/sysdb_private.h"   /* new_subdomain() */
 
-#define TESTS_PATH "tests_nss"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_nss_conf.ldb"
 #define TEST_DOM_NAME "nss_test"
 #define TEST_SUBDOM_NAME "test.subdomain"
diff --git a/src/tests/cmocka/test_pam_srv.c b/src/tests/cmocka/test_pam_srv.c
index 3c70c5990..3567b2bca 100644
--- a/src/tests/cmocka/test_pam_srv.c
+++ b/src/tests/cmocka/test_pam_srv.c
@@ -37,7 +37,7 @@
 #include "util/crypto/nss/nss_util.h"
 #endif
 
-#define TESTS_PATH "tests_pam"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_pam_conf.ldb"
 #define TEST_DOM_NAME "pam_test"
 #define TEST_SUBDOM_NAME "test.subdomain"
diff --git a/src/tests/cmocka/test_responder_cache_req.c b/src/tests/cmocka/test_responder_cache_req.c
index bc6e2dc8f..5fd43940d 100644
--- a/src/tests/cmocka/test_responder_cache_req.c
+++ b/src/tests/cmocka/test_responder_cache_req.c
@@ -28,7 +28,7 @@
 #include "db/sysdb.h"
 #include "responder/common/responder_cache_req.h"
 
-#define TESTS_PATH "tests_responder_cache_req"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_responder_cache_req_conf.ldb"
 #define TEST_DOM_NAME "responder_cache_req_test"
 #define TEST_ID_PROVIDER "ldap"
diff --git a/src/tests/cmocka/test_responder_common.c b/src/tests/cmocka/test_responder_common.c
index cb57c97fe..48e0e91a3 100644
--- a/src/tests/cmocka/test_responder_common.c
+++ b/src/tests/cmocka/test_responder_common.c
@@ -28,7 +28,7 @@
 #include "tests/cmocka/common_mock.h"
 #include "tests/cmocka/common_mock_resp.h"
 
-#define TESTS_PATH "tests_responder"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_responder_conf.ldb"
 #define TEST_DOM_NAME "responder_test"
 #define TEST_ID_PROVIDER "ldap"
diff --git a/src/tests/cmocka/test_sysdb_subdomains.c b/src/tests/cmocka/test_sysdb_subdomains.c
index 82e77815e..15dcf709f 100644
--- a/src/tests/cmocka/test_sysdb_subdomains.c
+++ b/src/tests/cmocka/test_sysdb_subdomains.c
@@ -32,7 +32,7 @@
 #include "tests/common.h"
 #include "db/sysdb_private.h" /* for sysdb->ldb member */
 
-#define TESTS_PATH "test_sysdb_subdomains_dir"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_sysdb_subdomains.ldb"
 
 #define TEST_DOM1_NAME "test_sysdb_subdomains_1"
diff --git a/src/tests/cmocka/test_sysdb_views.c b/src/tests/cmocka/test_sysdb_views.c
index c53d8187b..8ec9b53fb 100644
--- a/src/tests/cmocka/test_sysdb_views.c
+++ b/src/tests/cmocka/test_sysdb_views.c
@@ -32,7 +32,7 @@
 #include "providers/ipa/ipa_id.h"
 #include "db/sysdb_private.h" /* for sysdb->ldb member */
 
-#define TESTS_PATH "tests_sysdb_views"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_FILE "tests_conf.ldb"
 
 #define TEST_ANCHOR_PREFIX ":ANCHOR:"
diff --git a/src/tests/cmocka/test_utils.c b/src/tests/cmocka/test_utils.c
index c7ebe0997..2e413c87d 100644
--- a/src/tests/cmocka/test_utils.c
+++ b/src/tests/cmocka/test_utils.c
@@ -28,7 +28,7 @@
 #include "util/sss_nss.h"
 #include "test_utils.h"
 
-#define TESTS_PATH "tests_utils"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_DB "test_utils_conf.ldb"
 #define TEST_DOM_NAME "utils_test.ldb"
 
diff --git a/src/tests/krb5_utils-tests.c b/src/tests/krb5_utils-tests.c
index 9b3e4483c..c2db5af9a 100644
--- a/src/tests/krb5_utils-tests.c
+++ b/src/tests/krb5_utils-tests.c
@@ -32,7 +32,7 @@
 #include "util/sss_utf8.h"
 #include "tests/common.h"
 
-#define TESTS_PATH "tests_krb5_utils"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 
 #define BASE "/abc/def"
 #define FILENAME "ghi"
diff --git a/src/tests/simple_access-tests.c b/src/tests/simple_access-tests.c
index 3e8b310ee..a7d6a5278 100644
--- a/src/tests/simple_access-tests.c
+++ b/src/tests/simple_access-tests.c
@@ -30,7 +30,7 @@
 #include "providers/simple/simple_access.h"
 #include "tests/common.h"
 
-#define TESTS_PATH "tests_simple_access"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_FILE "tests_conf.ldb"
 
 const char *ulist_1[] = {"u1", "u2", NULL};
diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index 9e3fdec73..343314bd2 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -34,7 +34,7 @@
 #include "db/sysdb_autofs.h"
 #include "tests/common.h"
 
-#define TESTS_PATH "tests_sysdb"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_FILE "tests_conf.ldb"
 
 #define TEST_ATTR_NAME "test_attr_name"
diff --git a/src/tests/sysdb_ssh-tests.c b/src/tests/sysdb_ssh-tests.c
index 46f5c4791..bb93672e0 100644
--- a/src/tests/sysdb_ssh-tests.c
+++ b/src/tests/sysdb_ssh-tests.c
@@ -34,7 +34,7 @@
 #include "db/sysdb_services.h"
 #include "db/sysdb_ssh.h"
 
-#define TESTS_PATH "tests_sysdb_ssh"
+#define TESTS_PATH "tp_" BASE_FILE_STEM
 #define TEST_CONF_FILE "tests_conf.ldb"
 #define TEST_HOSTNAME "testhost"