[Pkg-sssd-devel] Bug#1060178: priv-wrapper: cmocka does not set CMOCKA_LIBRARY anymore.

Hefee hefee at debian.org
Sat Jan 6 23:08:41 GMT 2024


Package: priv-wrapper
Version: 1.0.1-3
Severity: normal
Tags: patch
X-Debbugs-Cc: hefee at debian.org

Hey,

cmocka does not set CMOCKA_LIBRARY anymore with 1.1.6+. You can easly
use cmoka as library name. I tested the attached patch locally and it
makes the autopkgtests pass again.

Additionally enables VERBOSE=1 for make, so it is easier to spot what
command is actually executed.

Regards,

hefee
-------------- next part --------------
diff --git a/debian/tests/tests b/debian/tests/tests
index 0c268ac..b85a7c0 100755
--- a/debian/tests/tests
+++ b/debian/tests/tests
@@ -4,7 +4,7 @@ rm -rf obj
 mkdir obj
 cd obj
 cmake -DUNIT_TESTING=1 ..
-make -C tests/
+make VERBOSE=1 -C tests/
 cd tests
 sed -e 's#\(LD_PRELOAD=\)[^;]*/\(libpriv_wrapper.so\)#\1\2#' -i CTestTestfile.cmake
 make test ARGS="--output-on-failure"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d33cf15..11526be 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -66,6 +66,6 @@ foreach(_PWRAP_TEST ${PWRAP_TESTS})
     add_cmocka_test(${_PWRAP_TEST}
                     SOURCES ${_PWRAP_TEST}.c
                     COMPILE_OPTIONS -D_GNU_SOURCE
-                    LINK_LIBRARIES ${CMOCKA_LIBRARY} PRIVATE defaults)
+                    LINK_LIBRARIES cmocka PRIVATE defaults)
     add_cmocka_test_environment(${_PWRAP_TEST})
 endforeach()


More information about the Pkg-sssd-devel mailing list