From 2e8e1bf2d731c80a0541ff8cf008bc344ebd19ba Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 29 Sep 2026 18:29:19 +0900 Subject: [PATCH] test: drop dlopen_gcrypt() test from test-dlopen-so libgcrypt is used only by test-fsprg. We do not add dlopen notes for unit tests, so the library may not be installed on the system. If systemd is built with HAVE_GCRYPT but libgcrypt is not installed, the test fails. There is no need to install libgcrypt solely for test-dlopen-so, so drop the test case. (cherry picked from commit 764b9a724925c4167e91fd36311e38aee8c6871a) --- src/test/meson.build | 6 +----- src/test/test-dlopen-so.c | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/test/meson.build b/src/test/meson.build index 013a3c8995..29aabddb8c 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -329,10 +329,7 @@ executables += [ 'type' : 'manual', }, test_template + { - 'sources' : files( - 'test-dlopen-so.c', - 'gcrypt-util.c', - ), + 'sources' : files('test-dlopen-so.c'), 'dependencies' : [ libacl_cflags, libapparmor_cflags, @@ -344,7 +341,6 @@ executables += [ libcurl_cflags, libfdisk_cflags, libfido2_cflags, - libgcrypt_cflags, libgnutls_cflags, libidn2_cflags, libkmod_cflags, diff --git a/src/test/test-dlopen-so.c b/src/test/test-dlopen-so.c index 0eca1356c0..db5d4ec594 100644 --- a/src/test/test-dlopen-so.c +++ b/src/test/test-dlopen-so.c @@ -10,7 +10,6 @@ #include "curl-util.h" #include "elf-util.h" #include "fdisk-util.h" -#include "gcrypt-util.h" #include "gnutls-util.h" #include "idn-util.h" #include "libarchive-util.h" @@ -55,7 +54,6 @@ static int run(int argc, char **argv) { ASSERT_DLOPEN(dlopen_dw, HAVE_ELFUTILS); ASSERT_DLOPEN(dlopen_elf, HAVE_ELFUTILS); ASSERT_DLOPEN(dlopen_fdisk, HAVE_LIBFDISK); - ASSERT_DLOPEN(dlopen_gcrypt, HAVE_GCRYPT); ASSERT_DLOPEN(dlopen_gnutls, HAVE_GNUTLS); ASSERT_DLOPEN(dlopen_idn, HAVE_LIBIDN2); ASSERT_DLOPEN(dlopen_libacl, HAVE_ACL);