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

[Hefee]

Package: uid-wrapper
Version: 1.3.0-4
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 b2b4504..a5adfa6 100755
--- a/debian/tests/tests
+++ b/debian/tests/tests
@@ -6,7 +6,7 @@ rm -rf obj debian
 mkdir obj
 cd obj
 cmake .. -DUNIT_TESTING=1
-make -C tests/
+make VERBOSE=1 -C tests/
 cd tests
 sed -e 's#\(LD_PRELOAD=[^:]*\)[^;]*/\(libuid_wrapper.so\)#\1:\2#' -i CTestTestfile.cmake
 make test ARGS="--output-on-failure"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 635e86e..0398261 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -59,7 +59,7 @@ function(ADD_CMOCKA_TEST_ENVIRONMENT _TEST_NAME)
                     ENVIRONMENT "${TORTURE_ENVIRONMENT}")
 endfunction()
 
-set(TESTSUITE_LIBRARIES ${UWRAP_REQUIRED_LIBRARIES} ${CMOCKA_LIBRARY})
+set(TESTSUITE_LIBRARIES ${UWRAP_REQUIRED_LIBRARIES} cmocka)
 
 if (BSD)
     add_definitions(-DBSD)