From: Andreas Reichel <[email protected]> Install needed packages into build environment.
Signed-off-by: Andreas Reichel <[email protected]> --- .travis-build.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis-build.sh b/.travis-build.sh index 6e534cb..a7e6beb 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -25,22 +25,14 @@ install_common_deps() install_native_deps() { - sudo apt-add-repository \ - 'deb http://archive.ubuntu.com/ubuntu xenial universe' - sudo apt-get update -qq sudo apt-get install --no-install-recommends \ - --target-release xenial check + libz-dev check } install_i586_deps() { sudo apt-get install --no-install-recommends \ - libz-dev:i386 - sudo apt-add-repository \ - 'deb http://archive.ubuntu.com/ubuntu xenial universe' - sudo apt-get update -qq - sudo apt-get install --no-install-recommends \ - --target-release xenial check:i386 + libz-dev:i386 check:i386 } prepare_build() @@ -86,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 @@ -103,10 +98,15 @@ case "$TARGET_EFFECTIVE" in prepare_build ./configure + # Ignore directories as they are not part of the project + ignore="" + ignore+=" -i fff" + 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 @@ -137,7 +137,7 @@ case "$TARGET_EFFECTIVE" in # Exit code '1' is returned if arguments are not valid or if no input # files are provided. Compare 'cppcheck --help'. exec cppcheck -f -q --error-exitcode=2 \ - $enable $suppress $cpp_conf $includes . + $enable $suppress $ignore $cpp_conf $includes . ;; coverity_prepare) install_common_deps -- 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/20171024122629.16634-5-andreas.reichel.ext%40siemens.com. For more options, visit https://groups.google.com/d/optout.
