diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-03-12 10:19:39 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-03-12 11:17:03 +0100 |
| commit | dd35d9da3fd43f1091b8ec496ec25d72e54d8e22 (patch) | |
| tree | 17dca845a42dfc9633f363cb11d2ad9e8c692bdc | |
| parent | f884a538ce79f70d44bdaaa9cb5ad2801dc36196 (diff) | |
CI: Fixed missing lcov prereq.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2b05a73b..f6fd55bfc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: run: | sudo apt-get update sudo apt-get install autoconf automake cmake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev zlib1g-dev - sudo apt-get install gcc-arm-linux-gnueabihf gcc-mingw-w64 libc6-dev + sudo apt-get install gcc-arm-linux-gnueabihf gcc-mingw-w64 libc6-dev lcov - name: Install Ubuntu Prerequisites (libgcrypt) if: startsWith(matrix.os, 'ubuntu') && !startsWith(matrix.ndpid_gcrypt, '-DNDPI_WITH_GCRYPT=OFF') run: | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd6c014f4..f27896c8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ before_script: build-essential make cmake binutils gcc autoconf automake \ libtool pkg-config git \ libpcap-dev libgcrypt-dev libgpg-error-dev libjson-c-dev zlib1g-dev \ - netcat-openbsd python3 python3-jsonschema tree + netcat-openbsd python3 python3-jsonschema tree lcov after_script: - cat /tmp/nDPIsrvd.log @@ -30,6 +30,8 @@ build_and_test: - cpack -G DEB - cd .. - ./test/run_tests.sh ./libnDPI ./build-cmake-submodule/nDPId-test + # generate coverage report + - make -C ./build-cmake-submodule coverage - > if ldd build/nDPId | grep -qoEi libndpi; then \ echo 'nDPId linked against a static libnDPI should not contain a shared linked libnDPI.' >&2; false; fi @@ -37,7 +39,7 @@ build_and_test: - mkdir build - cd build - export PKG_CONFIG_PATH="$(realpath ../build-cmake-submodule/libnDPI/lib/pkgconfig)" - - env CMAKE_C_FLAGS='-Werror' cmake .. -DENABLE_COVERAGE=ON -DBUILD_EXAMPLES=ON -DENABLE_SANITIZER=ON -DENABLE_MEMORY_PROFILING=ON -DENABLE_ZLIB=ON + - env CMAKE_C_FLAGS='-Werror' cmake .. -DBUILD_EXAMPLES=ON -DENABLE_SANITIZER=ON -DENABLE_MEMORY_PROFILING=ON -DENABLE_ZLIB=ON - make all VERBOSE=1 - cd .. - ./build/nDPId-test || test $? -eq 1 @@ -45,8 +47,6 @@ build_and_test: # dameon start/stop test - NUSER=nobody make -C ./build daemon VERBOSE=1 - NUSER=nobody make -C ./build daemon VERBOSE=1 - # generate coverage report - - make -C ./build coverage # make dist - make -C ./build dist artifacts: diff --git a/CMakeLists.txt b/CMakeLists.txt index 56d3c2c4c..dbdd093b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,7 @@ endif() if(ENABLE_COVERAGE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage") add_custom_target(coverage) add_custom_command( TARGET coverage |