From 4e3640f046d585c08fae559c856fefbb33f4c4f4 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 11 Apr 2020 17:40:26 +0200 Subject: [PATCH] [#771] Do not run dlclose/musl part --- configure.ac | 7 +++++++ src/lib/hooks/tests/library_manager_unittest.cc | 3 +++ 2 files changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac index 3a4f574cb5..87ea3b13ad 100755 --- a/configure.ac +++ b/configure.ac @@ -281,6 +281,13 @@ case "$host" in esac KEA_CXXFLAGS="$KEA_CXXFLAGS $MULTITHREADING_FLAG" +dumpmachine=`$CXX -dumpmachine` +case "$dumpmachine" in +*-musl) + AC_DEFINE([LIBC_MUSL], [1], [Define to 1 if libc is musl]) + ;; +esac + # Disable -Werror by default. Only use it if specifically enabled. # The usage of this flag is: # diff --git a/src/lib/hooks/tests/library_manager_unittest.cc b/src/lib/hooks/tests/library_manager_unittest.cc index 8f12f350d5..c0174a41bf 100644 --- a/src/lib/hooks/tests/library_manager_unittest.cc +++ b/src/lib/hooks/tests/library_manager_unittest.cc @@ -731,8 +731,11 @@ TEST_F(LibraryManagerTest, libraryLoggerSetup) { // After unloading the library, the messages should be unregistered. EXPECT_TRUE(lib_manager.unloadLibrary()); + // The musl libc does not implement dlclose +#ifndef LIBC_MUSL EXPECT_TRUE(dict->getText("BCL_LOAD_START").empty()); EXPECT_TRUE(dict->getText("BCL_LOAD_END").empty()); +#endif } } // Anonymous namespace -- 2.47.2