diff --git a/login_server/CMakeLists.txt.lib b/login_server/CMakeLists.txt.lib index b376dc775..9f1422630 100644 --- a/login_server/CMakeLists.txt.lib +++ b/login_server/CMakeLists.txt.lib @@ -214,16 +214,31 @@ enable_testing() if(UNIX) include(cmake/CodeCoverage.cmake) append_coverage_compiler_flags() -setup_target_for_coverage_gcovr_html( - NAME coverage - EXECUTABLE Gradido_LoginServer_Test - DEPENDENCIES lib/libmariadb.so.3 +set(EXCLUDE_FOR_HTML_COV + "${CMAKE_CURRENT_SOURCE_DIR}/build/proto/*" + "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/*" + "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/test/*" ) +setup_target_for_coverage_gcovr_html( + NAME coverage_html + EXECUTABLE Gradido_LoginServer_Test + EXCLUDE ${EXCLUDE_FOR_HTML_COV} + #DEPENDENCIES lib/libmariadb.so.3 +) +#set(EXCLUDE_FOR_COV + #${EXCLUDE_FOR_HTML_COV} + #"/usr/include/*" +#) +#setup_target_for_coverage_lcov( + # NAME coverage + # EXECUTABLE Gradido_LoginServer_Test + #EXCLUDE "${EXCLUDE_FOR_COV}" + #DEPENDENCIES lib/libmariadb.so.3 +#) endif() - #_TEST_BUILD -find_package(GTest CONFIG REQUIRED) -include(GoogleTest) + +add_subdirectory("googletest") add_executable(Gradido_LoginServer_Test ${LOCAL_SRCS} ${LOCAL_TEST_SRC}) target_compile_definitions(Gradido_LoginServer_Test PUBLIC "_TEST_BUILD") @@ -236,7 +251,7 @@ if(WIN32) #TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test debug ${COMPILED_MARIADB_CLIENT_DEBUG} Shlwapi) #TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test debug ${GRPC_LIBS} ${PROTOBUF_DEBUG_LIBS}) else() - target_link_libraries(Gradido_LoginServer_Test ${POCO_LIBS} libmariadb sodium GTest::gtest) + target_link_libraries(Gradido_LoginServer_Test gRPC::grpc++ ${PROTOBUF_LIBS} ${MYSQL_LIBRARIES} ${POCO_LIBS} sodium pthread gtest) endif() add_test(NAME main COMMAND Gradido_LoginServer_Test) \ No newline at end of file diff --git a/login_server/Dockerfile b/login_server/Dockerfile index 06efe6bf5..c35eb63f1 100644 --- a/login_server/Dockerfile +++ b/login_server/Dockerfile @@ -1,17 +1,22 @@ + ######################################################################################################### # Build debug ######################################################################################################### -FROM gradido/login_dependencies:alpine-debug-1 as debug +FROM gradido/login_dependencies:alpine-debug-2 as debug ENV DOCKER_WORKDIR="/code" WORKDIR ${DOCKER_WORKDIR} COPY ./CMakeLists.txt.lib ./CMakeLists.txt COPY ./src ./src +COPY ./cmake/CodeCoverage.cmake ./cmake/CodeCoverage.cmake COPY ./dependencies/cmake-modules ./dependencies/cmake-modules COPY ./dependencies/spirit-po ./dependencies/spirit-po COPY ./dependencies/tinf ./dependencies/tinf COPY ./scripts ./scripts +RUN cp -r /usr/local/googletest ./ + +RUN apk add --update --no-cache gcovr RUN mkdir build && \ cd build && \ diff --git a/login_server/Dockerfiles/Dockerfile.dependencies-alpine b/login_server/Dockerfiles/Dockerfile.dependencies-alpine index a2cc3225c..0484db704 100644 --- a/login_server/Dockerfiles/Dockerfile.dependencies-alpine +++ b/login_server/Dockerfiles/Dockerfile.dependencies-alpine @@ -68,6 +68,7 @@ COPY --from=alpine-gxx-cmake /usr/local/share/cmake-3.19/Templates /usr/local/sh # copy from grpc COPY --from=alpine-gxx-grpc /usr/local /usr/local +COPY --from=alpine-gxx-grpc /grpc/third_party/googletest /usr/local/googletest # COPY from poco