picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: add tpm2 and fido2 libs to dlopen test

This commit is contained in:
Lennart Poettering 2020-12-09 21:13:58 +01:00
parent 889914ef6c
commit a60d5b2f38
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/test-dlopen-so.c
View File

@ -5,11 +5,13 @@
#include "cryptsetup-util.h" #include "cryptsetup-util.h"
#include "idn-util.h" #include "idn-util.h"
#include "libfido2-util.h"
#include "macro.h" #include "macro.h"
#include "main-func.h" #include "main-func.h"
#include "pwquality-util.h" #include "pwquality-util.h"
#include "qrcode-util.h" #include "qrcode-util.h"
#include "tests.h" #include "tests.h"
#include "tpm2-util.h"
static int run(int argc, char **argv) { static int run(int argc, char **argv) {
test_setup_logging(LOG_DEBUG); test_setup_logging(LOG_DEBUG);
@ -34,6 +36,14 @@ static int run(int argc, char **argv) {
assert_se(dlopen_qrencode() >= 0); assert_se(dlopen_qrencode() >= 0);
#endif #endif
#if HAVE_TPM2
assert_se(dlopen_tpm2() >= 0);
#endif
#if HAVE_LIBFIDO2
assert_se(dlopen_libfido2() >= 0);
#endif
return 0; return 0;
} }

2
test/test-functions
View File

@ -697,7 +697,7 @@ install_missing_libraries() {
# A number of dependencies is now optional via dlopen, so the install # A number of dependencies is now optional via dlopen, so the install
# script will not pick them up, since it looks at linkage. # script will not pick them up, since it looks at linkage.
for lib in libcryptsetup libidn libidn2 pwquality libqrencode; do for lib in libcryptsetup libidn libidn2 pwquality libqrencode tss2-esys tss2-rc tss2-mu libfido2; do
if pkg-config --exists ${lib}; then if pkg-config --exists ${lib}; then
path=$(pkg-config --variable=libdir ${lib}) path=$(pkg-config --variable=libdir ${lib})
if ! [[ ${lib} =~ ^lib ]]; then if ! [[ ${lib} =~ ^lib ]]; then