mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid building test_suite when we make install

Browse Source
This commit is contained in:
louiz’
2017-04-13 00:19:17 +02:00
parent 3a8203c366
commit dc5ad49b40
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2 -3
View File
@@ -36,7 +36,7 @@ variables:
script: script:
- "echo Running cmake with the following parameters: -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}" - "echo Running cmake with the following parameters: -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}"
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL} - cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- make -j$(nproc || echo 1) - make everything -j$(nproc || echo 1)
- make coverage_check -j$(nproc || echo 1) - make coverage_check -j$(nproc || echo 1)
artifacts: artifacts:
expire_in: 8 hours expire_in: 8 hours
@@ -145,7 +145,6 @@ test:freebsd:
stage: test stage: test
script: script:
- cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL} - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- make
- make check - make check
- make e2e - make e2e
@@ -231,7 +230,7 @@ coverity:
script: script:
- export PATH=$PATH:~/coverity/bin - export PATH=$PATH:~/coverity/bin
- cmake .. -DWITHOUT_SYSTEMD=1 - cmake .. -DWITHOUT_SYSTEMD=1
- cov-build --dir cov-int make -j$(nproc || echo 1) - cov-build --dir cov-int make everything -j$(nproc || echo 1)
- tar czvf biboumi_coverity.tgz cov-int - tar czvf biboumi_coverity.tgz cov-int
- curl --form token=$COVERITY_TOKEN --form email=louiz@louiz.org --form file=@biboumi_coverity.tgz --form version="$(git rev-parse --short HEAD)" --form description="Automatic submission by gitlab-ci" https://scan.coverity.com/builds?project=louiz%2Fbiboumi - curl --form token=$COVERITY_TOKEN --form email=louiz@louiz.org --form file=@biboumi_coverity.tgz --form version="$(git rev-parse --short HEAD)" --form description="Automatic submission by gitlab-ci" https://scan.coverity.com/builds?project=louiz%2Fbiboumi
dependencies: [] dependencies: []
CMakeLists.txt
+4
View File
@@ -228,6 +228,7 @@ add_executable(test_suite ${source_tests}
$<TARGET_OBJECTS:irc> $<TARGET_OBJECTS:irc>
$<TARGET_OBJECTS:identd> $<TARGET_OBJECTS:identd>
$<TARGET_OBJECTS:database>) $<TARGET_OBJECTS:database>)
set_target_properties(test_suite PROPERTIES EXCLUDE_FROM_ALL TRUE)
# #
## Link the executables with their libraries ## Link the executables with their libraries
@@ -298,8 +299,10 @@ endif()
# #
add_custom_target(check COMMAND "test_suite" add_custom_target(check COMMAND "test_suite"
DEPENDS test_suite biboumi) DEPENDS test_suite biboumi)
set_target_properties(check PROPERTIES EXCLUDE_FROM_ALL TRUE)
add_custom_target(e2e COMMAND "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/" add_custom_target(e2e COMMAND "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/"
DEPENDS biboumi) DEPENDS biboumi)
set_target_properties(e2e PROPERTIES EXCLUDE_FROM_ALL TRUE)
add_custom_target(e2e_valgrind COMMAND "E2E_BIBOUMI_SUPP_DIR=${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/" "E2E_BIBOUMI_VALGRIND=1" "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/" add_custom_target(e2e_valgrind COMMAND "E2E_BIBOUMI_SUPP_DIR=${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/" "E2E_BIBOUMI_VALGRIND=1" "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/"
DEPENDS biboumi) DEPENDS biboumi)
if(CMAKE_BUILD_TYPE MATCHES Debug) if(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -323,6 +326,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )
endif() endif()
add_custom_target(everything DEPENDS test_suite biboumi)
# #
## Install target ## Install target