scottk/nDPId-2
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId-2.git synced 2025-10-31 18:27:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Fixed missing lcov prereq.

Browse Source 
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2022-03-12 10:19:39 +01:00
parent f884a538ce
commit dd35d9da3f
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -28,7 +28,7 @@ jobs:
run: | run: |
sudo apt-get update 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 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) - name: Install Ubuntu Prerequisites (libgcrypt)
if: startsWith(matrix.os, 'ubuntu') && !startsWith(matrix.ndpid_gcrypt, '-DNDPI_WITH_GCRYPT=OFF') if: startsWith(matrix.os, 'ubuntu') && !startsWith(matrix.ndpid_gcrypt, '-DNDPI_WITH_GCRYPT=OFF')
run: | run: |

8
.gitlab-ci.yml
View File

@@ -12,7 +12,7 @@ before_script:
build-essential make cmake binutils gcc autoconf automake \ build-essential make cmake binutils gcc autoconf automake \
libtool pkg-config git \ libtool pkg-config git \
libpcap-dev libgcrypt-dev libgpg-error-dev libjson-c-dev zlib1g-dev \ 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: after_script:
- cat /tmp/nDPIsrvd.log - cat /tmp/nDPIsrvd.log
@@ -30,6 +30,8 @@ build_and_test:
- cpack -G DEB - cpack -G DEB
- cd .. - cd ..
- ./test/run_tests.sh ./libnDPI ./build-cmake-submodule/nDPId-test - ./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 \ 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 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 - mkdir build
- cd build - cd build
- export PKG_CONFIG_PATH="$(realpath ../build-cmake-submodule/libnDPI/lib/pkgconfig)" - 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 - make all VERBOSE=1
- cd .. - cd ..
- ./build/nDPId-test || test $? -eq 1 - ./build/nDPId-test || test $? -eq 1
@@ -45,8 +47,6 @@ build_and_test:
# dameon start/stop test # dameon start/stop test
- NUSER=nobody make -C ./build daemon VERBOSE=1 - NUSER=nobody make -C ./build daemon VERBOSE=1
- 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 dist
- make -C ./build dist - make -C ./build dist
artifacts: artifacts:

1
CMakeLists.txt
View File

@@ -114,6 +114,7 @@ endif()
if(ENABLE_COVERAGE) if(ENABLE_COVERAGE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --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_target(coverage)
add_custom_command( add_custom_command(
TARGET coverage TARGET coverage