From c20090420028cfd0427ce0b80a94b304ec2ed3e1 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Fri, 21 May 2021 16:21:39 +0200 Subject: [PATCH] get make coverage command running in docker --- login_server/CMakeLists.txt.lib | 2 +- login_server/Dockerfile | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/login_server/CMakeLists.txt.lib b/login_server/CMakeLists.txt.lib index 267760282..fe655c846 100644 --- a/login_server/CMakeLists.txt.lib +++ b/login_server/CMakeLists.txt.lib @@ -233,7 +233,7 @@ setup_target_for_coverage_lcov( NAME coverage EXECUTABLE Gradido_LoginServer_Test EXCLUDE "${EXCLUDE_FOR_COV}" - DEPENDENCIES lib/libmariadb.so.3 + #DEPENDENCIES lib/libmariadb.so.3 ) endif() #_TEST_BUILD diff --git a/login_server/Dockerfile b/login_server/Dockerfile index 3abd1c1b2..e25ed5c3c 100644 --- a/login_server/Dockerfile +++ b/login_server/Dockerfile @@ -37,14 +37,21 @@ FROM debug as test ENV DOCKER_WORKDIR="/code" WORKDIR ${DOCKER_WORKDIR} +RUN apk add --no-cache bash perl -RUN mkdir build && \ - cd build && \ +RUN git clone https://github.com/linux-test-project/lcov.git --branch=v1.15 && \ + cd lcov && \ + make install + +RUN cd build && \ cmake -DCMAKE_BUILD_TYPE=Debug .. && \ - make -j$(nproc) Gradido_LoginServer_Test + make -j$(nproc) Gradido_LoginServer_Test + -RUN chmod +x build/bin/Gradido_LoginServer_Test -ENTRYPOINT [ "make -C build -j$(nproc) coverage_html" ] +#RUN chmod +x build/bin/Gradido_LoginServer_Test +#CMD [ "./build/bin/Gradido_LoginServer" ] +#ENTRYPOINT [ "/usr/bin/make", "-C", "/code/build", "coverage" ] +ENTRYPOINT cd build && ls -la && make coverage; ######################################################################################################### # Build release