From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 25 Oct 2025 17:15:05 +0000 (+0300)
Subject: lib-storage, mail-crypt: test-mail* - Use the new test-dir API
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8826cabb69fc61adc071b90f6554a8a2508506d;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage, mail-crypt: test-mail* - Use the new test-dir API

mail-crypt's test-mail-key also uses test-mail-storage-common API, so it
now needs the test_dir_init() call.
---

diff --git a/src/lib-storage/test-mail-storage-common.c b/src/lib-storage/test-mail-storage-common.c
index e5dc928398..8defad5e5e 100644
--- a/src/lib-storage/test-mail-storage-common.c
+++ b/src/lib-storage/test-mail-storage-common.c
@@ -1,6 +1,7 @@
 /* Copyright (c) 2017-2020 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
+#include "test-dir.h"
 #include "ioloop.h"
 #include "mkdir-parents.h"
 #include "unlink-directory.h"
@@ -12,17 +13,15 @@
 struct test_mail_storage_ctx *test_mail_storage_init(void)
 {
 	struct test_mail_storage_ctx *ctx;
-	const char *current_dir, *error;
+	const char *error;
 	pool_t pool;
 
 	pool = pool_allocfree_create("test pool");
 	ctx = p_new(pool, struct test_mail_storage_ctx, 1);
 	ctx->pool = pool;
 
-	if (t_get_working_dir(&current_dir, &error) < 0)
-		i_fatal("Failed to get current directory: %s", error);
 	ctx->home_root = p_strdup_printf(ctx->pool, "%s/.test-home/",
-					 current_dir);
+					 test_dir_get());
 
 	if (unlink_directory(ctx->home_root, UNLINK_DIRECTORY_FLAG_RMDIR, &error) < 0 &&
 	    errno != ENOENT)
diff --git a/src/lib-storage/test-mail-storage.c b/src/lib-storage/test-mail-storage.c
index d5adfeb597..3e1e55c4b1 100644
--- a/src/lib-storage/test-mail-storage.c
+++ b/src/lib-storage/test-mail-storage.c
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "ioloop.h"
 #include "test-common.h"
+#include "test-dir.h"
 #include "master-service.h"
 #include "test-mail-storage-common.h"
 
@@ -747,7 +748,7 @@ int main(int argc, char **argv)
 					     MASTER_SERVICE_FLAG_NO_SSL_INIT |
 					     MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME,
 					     &argc, &argv, "");
-
+	test_dir_init("test-mail-storage");
 	ret = test_run(tests);
 
 	master_service_deinit(&master_service);
diff --git a/src/lib-storage/test-mail.c b/src/lib-storage/test-mail.c
index 3262d06af2..e2e1c3b5cc 100644
--- a/src/lib-storage/test-mail.c
+++ b/src/lib-storage/test-mail.c
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "test-common.h"
+#include "test-dir.h"
 #include "istream.h"
 #include "master-service.h"
 #include "message-size.h"
@@ -748,6 +749,7 @@ int main(int argc, char **argv)
 
 	if (null_strcmp(argv[1], "-D") == 0)
 		event_set_forced_debug(test_event, TRUE);
+	test_dir_init("test-mail");
 	ret = test_run(tests);
 	master_service_deinit(&master_service);
 	return ret;
diff --git a/src/plugins/mail-crypt/test-mail-key.c b/src/plugins/mail-crypt/test-mail-key.c
index a99b0cc852..af3f5b8252 100644
--- a/src/plugins/mail-crypt/test-mail-key.c
+++ b/src/plugins/mail-crypt/test-mail-key.c
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "test-common.h"
+#include "test-dir.h"
 #include "hex-binary.h"
 #include "settings.h"
 #include "master-service.h"
@@ -429,6 +430,7 @@ int main(int argc, char **argv)
 					     &argc, &argv, "");
 	settings_info_register(&dict_setting_parser_info);
 	settings_info_register(&dict_file_setting_parser_info);
+	test_dir_init("test-mail-key");
 	int ret = test_run(tests);
 	master_service_deinit(&master_service);
 	return ret;