From: Duncan Overbruck <mail@duncano.de>
Date: Mon, 18 Dec 2023 15:12:22 +0000 (+0100)
Subject: lib: test-file-cache - build expected error strings using strerror
X-Git-Tag: 2.4.0~1528
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbc5d4670cffe4c5d5b1887098074182c3a0ec4b;p=thirdparty%2Fdovecot%2Fcore.git

lib: test-file-cache - build expected error strings using strerror

Different libc libraries like musl and glibc have different error
strings for the same errno's, to make the tests work as expected
with musl libc, use strerror to build the expected error string.
---

diff --git a/src/lib/test-file-cache.c b/src/lib/test-file-cache.c
index 0fc70d6208..4316dfdc9f 100644
--- a/src/lib/test-file-cache.c
+++ b/src/lib/test-file-cache.c
@@ -243,8 +243,10 @@ static void test_file_cache_errors(void)
 	size_t size;
 
 	/* file does not exist and we try large enough mapping */
-	test_expect_error_string("fstat(.test_file_cache) failed: "
-				 "Bad file descriptor");
+	const char *errstr =
+		t_strdup_printf("fstat(.test_file_cache) failed: %s",
+				strerror(EBADF));
+	test_expect_error_string(errstr);
 	test_assert(file_cache_read(cache, 0, 2*1024*1024) == -1);
 	const unsigned char *map = file_cache_get_map(cache, &size);
 	test_assert(size == 0);
@@ -259,17 +261,16 @@ static void test_file_cache_errors(void)
 		.rlim_cur = 1,
 		.rlim_max = rl_cur.rlim_max
 	};
-	const char *errstr =
-		t_strdup_printf("mmap_anon(.test_file_cache, %zu) failed: "
-				"Cannot allocate memory", page_size);
+	errstr = t_strdup_printf("mmap_anon(.test_file_cache, %zu) failed: %s",
+				 page_size, strerror(ENOMEM));
 	test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
 	test_expect_error_string(errstr);
 	test_assert(file_cache_set_size(cache, 1024) == -1);
 	test_assert(setrlimit(RLIMIT_AS, &rl_cur) == 0);
 
 	/* same for mremap */
-	errstr = t_strdup_printf("mremap_anon(.test_file_cache, %zu) failed: "
-				 "Cannot allocate memory", page_size*2);
+	errstr = t_strdup_printf("mremap_anon(.test_file_cache, %zu) failed: %s",
+				 page_size*2, strerror(ENOMEM));
 	test_assert(file_cache_set_size(cache, 1) == 0);
 	test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
 	test_expect_error_string(errstr);