From f6b8ef226d5f4d124d51d3d6a70171f8c79c5f39 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 1 Nov 2025 20:52:34 +0100
Subject: [PATCH] lib-index: test-mail-{index,cache} - Use the new test-dir API

---
 src/lib-index/test-mail-cache-fields.c |  1 +
 src/lib-index/test-mail-cache-purge.c  |  1 +
 src/lib-index/test-mail-cache.c        |  1 +
 src/lib-index/test-mail-index-modseq.c |  1 +
 src/lib-index/test-mail-index.c        |  1 +
 src/lib-index/test-mail-index.h        | 19 ++++++++++++++-----
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/lib-index/test-mail-cache-fields.c b/src/lib-index/test-mail-cache-fields.c
index 1a99c774fd..2c7245eb36 100644
--- a/src/lib-index/test-mail-cache-fields.c
+++ b/src/lib-index/test-mail-cache-fields.c
@@ -110,5 +110,6 @@ int main(void)
 		test_mail_cache_fields_read_write,
 		NULL
 	};
+	test_dir_init("mail-cache-fields");
 	return test_run(test_functions);
 }
diff --git a/src/lib-index/test-mail-cache-purge.c b/src/lib-index/test-mail-cache-purge.c
index 24dd3bb74d..3c251a24ac 100644
--- a/src/lib-index/test-mail-cache-purge.c
+++ b/src/lib-index/test-mail-cache-purge.c
@@ -1111,5 +1111,6 @@ int main(void)
 		test_mail_cache_purge_deadlines,
 		NULL
 	};
+	test_dir_init("mail-cache-purge");
 	return test_run(test_functions);
 }
diff --git a/src/lib-index/test-mail-cache.c b/src/lib-index/test-mail-cache.c
index 352e57f26a..282dc95190 100644
--- a/src/lib-index/test-mail-cache.c
+++ b/src/lib-index/test-mail-cache.c
@@ -822,5 +822,6 @@ int main(void)
 		test_mail_cache_duplicate_fields,
 		NULL
 	};
+	test_dir_init("mail-cache");
 	return test_run(test_functions);
 }
diff --git a/src/lib-index/test-mail-index-modseq.c b/src/lib-index/test-mail-index-modseq.c
index c900966254..9ea15a25f0 100644
--- a/src/lib-index/test-mail-index-modseq.c
+++ b/src/lib-index/test-mail-index-modseq.c
@@ -73,5 +73,6 @@ int main(void)
 		test_mail_index_modseq_get_next_log_offset,
 		NULL
 	};
+	test_dir_init("mail-index-modseq");
 	return test_run(test_functions);
 }
diff --git a/src/lib-index/test-mail-index.c b/src/lib-index/test-mail-index.c
index 84d2b43f51..49001ced98 100644
--- a/src/lib-index/test-mail-index.c
+++ b/src/lib-index/test-mail-index.c
@@ -165,5 +165,6 @@ int main(void)
 		test_mail_index_new_extension,
 		NULL
 	};
+	test_dir_init("mail-index");
 	return test_run(test_functions);
 }
diff --git a/src/lib-index/test-mail-index.h b/src/lib-index/test-mail-index.h
index e8251e974d..f6ddca5f84 100644
--- a/src/lib-index/test-mail-index.h
+++ b/src/lib-index/test-mail-index.h
@@ -4,14 +4,21 @@
 #include "ioloop.h"
 #include "unlink-directory.h"
 #include "mail-index-private.h"
+#include "test-dir.h"
 
 #define TESTDIR_NAME ".dovecot.test"
 
+static inline const char *test_mail_index_get_dir(void)
+{
+	return test_dir_prepend(TESTDIR_NAME);
+}
+
 static inline struct mail_index *test_mail_index_open(bool idx_initial_created)
 {
 	struct mail_index *index;
 
-	index = mail_index_alloc(NULL, TESTDIR_NAME, "test.dovecot.index");
+	index = mail_index_alloc(NULL, test_mail_index_get_dir(),
+				 "test.dovecot.index");
 	test_assert(mail_index_open_or_create(index, MAIL_INDEX_OPEN_FLAG_CREATE) ==
 		   (idx_initial_created ? 1 : 0));
 	return index;
@@ -19,11 +26,12 @@ static inline struct mail_index *test_mail_index_open(bool idx_initial_created)
 
 static inline struct mail_index *test_mail_index_init(bool idx_initial_created)
 {
+	const char *testdir_name = test_mail_index_get_dir();
 	const char *error;
 
-	(void)unlink_directory(TESTDIR_NAME, UNLINK_DIRECTORY_FLAG_RMDIR, &error);
-	if (mkdir(TESTDIR_NAME, 0700) < 0)
-		i_error("mkdir(%s) failed: %m", TESTDIR_NAME);
+	(void)unlink_directory(testdir_name, UNLINK_DIRECTORY_FLAG_RMDIR, &error);
+	if (mkdir(testdir_name, 0700) < 0)
+		i_error("mkdir(%s) failed: %m", testdir_name);
 
 	ioloop_time = 1;
 
@@ -40,7 +48,8 @@ static inline void test_mail_index_delete(void)
 {
 	const char *error;
 
-	(void)unlink_directory(TESTDIR_NAME, UNLINK_DIRECTORY_FLAG_RMDIR, &error);
+	(void)unlink_directory(test_mail_index_get_dir(),
+			       UNLINK_DIRECTORY_FLAG_RMDIR, &error);
 }
 
 static inline void test_mail_index_deinit(struct mail_index **index)
-- 
2.47.3