commit d2e998771e23a5bfb8bc4a6e7479c89584aef335 Author: Jacob Welsh AuthorDate: Sat Nov 26 02:27:36 2022 +0000 Commit: Jacob Welsh CommitDate: Sat Nov 26 02:27:36 2022 +0000 Type: portability fix lib: don't demand specific error strings in file_cache_errors test "Cannot allocate memory" is spelled "Out of memory" on musl. diff --git a/src/lib/test-file-cache.c b/src/lib/test-file-cache.c index 6bac9abfe7..75d34caaa6 100644 --- a/src/lib/test-file-cache.c +++ b/src/lib/test-file-cache.c @@ -258,20 +258,15 @@ 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); test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0); - test_expect_error_string(errstr); + test_expect_errors(1); 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); test_assert(file_cache_set_size(cache, 1) == 0); test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0); - test_expect_error_string(errstr); + test_expect_errors(1); test_assert(file_cache_set_size(cache, page_size*2) == -1); test_assert(setrlimit(RLIMIT_AS, &rl_cur) == 0);