IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to get test working in docker build

Browse Source
This commit is contained in:
einhorn_b 2021-05-20 18:53:07 +02:00
parent 2a9dab92b1
commit 3e9d7d4f9d
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
login_server/CMakeLists.txt.lib
View File

@ -214,16 +214,31 @@ enable_testing()
if(UNIX) if(UNIX)
include(cmake/CodeCoverage.cmake) include(cmake/CodeCoverage.cmake)
append_coverage_compiler_flags() append_coverage_compiler_flags()
setup_target_for_coverage_gcovr_html( set(EXCLUDE_FOR_HTML_COV
NAME coverage "${CMAKE_CURRENT_SOURCE_DIR}/build/proto/*"
EXECUTABLE Gradido_LoginServer_Test "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/*"
DEPENDENCIES lib/libmariadb.so.3 "${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() endif()
#_TEST_BUILD #_TEST_BUILD
find_package(GTest CONFIG REQUIRED)
include(GoogleTest) add_subdirectory("googletest")
add_executable(Gradido_LoginServer_Test ${LOCAL_SRCS} ${LOCAL_TEST_SRC}) add_executable(Gradido_LoginServer_Test ${LOCAL_SRCS} ${LOCAL_TEST_SRC})
target_compile_definitions(Gradido_LoginServer_Test PUBLIC "_TEST_BUILD") 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 ${COMPILED_MARIADB_CLIENT_DEBUG} Shlwapi)
#TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test debug ${GRPC_LIBS} ${PROTOBUF_DEBUG_LIBS}) #TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test debug ${GRPC_LIBS} ${PROTOBUF_DEBUG_LIBS})
else() 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() endif()
add_test(NAME main COMMAND Gradido_LoginServer_Test) add_test(NAME main COMMAND Gradido_LoginServer_Test)

7
login_server/Dockerfile
View File

@ -1,17 +1,22 @@
######################################################################################################### #########################################################################################################
# Build debug # Build debug
######################################################################################################### #########################################################################################################
FROM gradido/login_dependencies:alpine-debug-1 as debug FROM gradido/login_dependencies:alpine-debug-2 as debug
ENV DOCKER_WORKDIR="/code" ENV DOCKER_WORKDIR="/code"
WORKDIR ${DOCKER_WORKDIR} WORKDIR ${DOCKER_WORKDIR}
COPY ./CMakeLists.txt.lib ./CMakeLists.txt COPY ./CMakeLists.txt.lib ./CMakeLists.txt
COPY ./src ./src COPY ./src ./src
COPY ./cmake/CodeCoverage.cmake ./cmake/CodeCoverage.cmake
COPY ./dependencies/cmake-modules ./dependencies/cmake-modules COPY ./dependencies/cmake-modules ./dependencies/cmake-modules
COPY ./dependencies/spirit-po ./dependencies/spirit-po COPY ./dependencies/spirit-po ./dependencies/spirit-po
COPY ./dependencies/tinf ./dependencies/tinf COPY ./dependencies/tinf ./dependencies/tinf
COPY ./scripts ./scripts COPY ./scripts ./scripts
RUN cp -r /usr/local/googletest ./
RUN apk add --update --no-cache gcovr
RUN mkdir build && \ RUN mkdir build && \
cd build && \ cd build && \

1
login_server/Dockerfiles/Dockerfile.dependencies-alpine
View File

@ -68,6 +68,7 @@ COPY --from=alpine-gxx-cmake /usr/local/share/cmake-3.19/Templates /usr/local/sh
# copy from grpc # copy from grpc
COPY --from=alpine-gxx-grpc /usr/local /usr/local COPY --from=alpine-gxx-grpc /usr/local /usr/local
COPY --from=alpine-gxx-grpc /grpc/third_party/googletest /usr/local/googletest
# COPY from poco # COPY from poco