From: Andreas Reichel <[email protected]> Use libcheck as new unit testing framework.
Signed-off-by: Andreas Reichel <[email protected]> --- .travis-build.sh | 17 +++++++++++------ configure.ac | 3 +++ docs/COMPILE.md | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.travis-build.sh b/.travis-build.sh index 7e79e9a..4e9e3a9 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -25,13 +25,14 @@ install_common_deps() install_native_deps() { - true + sudo apt-get install --no-install-recommends \ + libz-dev check } install_i586_deps() { sudo apt-get install --no-install-recommends \ - libz-dev:i386 + libz-dev:i386 check:i386 } prepare_build() @@ -77,14 +78,17 @@ case "$TARGET_EFFECTIVE" in install_i586_deps prepare_build enter_build + export PKG_CONFIG_DIR= + export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig + export PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu ../configure --with-gnuefi-lib-dir=/usr/lib32 CFLAGS=-m32 \ host_alias=i586-linux exec make check ;; cppcheck) - install_common_deps - install_native_deps + install_common_deps + install_native_deps echo "Building and installing cppcheck..." if ! install_cppcheck >cppcheck_build.log 2>&1 then @@ -96,8 +100,9 @@ case "$TARGET_EFFECTIVE" in suppress="" # Justified suppressions: - # Not part of the project: - suppress+=" --suppress=variableScope:/usr/include/bits/stdlib-bsearch.h" + # Does not belong to the project + suppress+=" --suppress=*:/usr/include/*" + suppress+=" --suppress=*:/usr/include/bits/*" # Function 'efi_main' is called by efi: suppress+=" --suppress=unusedFunction:main.c" # Some functions are defined for API only diff --git a/configure.ac b/configure.ac index d1dd082..7e8e7e9 100644 --- a/configure.ac +++ b/configure.ac @@ -163,6 +163,9 @@ AC_ARG_WITH([mem-uservars], ]) AC_DEFINE_UNQUOTED([ENV_MEM_USERVARS], [${ENV_MEM_USERVARS}], [Reserved memory for user variables]) + +PKG_PROG_PKG_CONFIG() +PKG_CHECK_MODULES(LIBCHECK, check) # ------------------------------------------------------------------------------ AC_CONFIG_FILES([ Makefile diff --git a/docs/COMPILE.md b/docs/COMPILE.md index 0429d81..e194601 100644 --- a/docs/COMPILE.md +++ b/docs/COMPILE.md @@ -5,13 +5,13 @@ ### Arch Linux ### ``` -pacman -S gnu-efi-libs pciutils +pacman -S gnu-efi-libs pciutils check ``` ### Debian 8 ### ``` -apt-get install gnu-efi libpci-dev +apt-get install gnu-efi libpci-dev check ``` ## Compilation ## -- 2.14.2 -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/efibootguard-dev/20171102155648.16140-3-andreas.reichel.ext%40siemens.com. For more options, visit https://groups.google.com/d/optout.
