summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2017-04-13 00:19:17 +0200
committerlouiz’ <louiz@louiz.org>2017-04-13 00:19:17 +0200
commitdc5ad49b4011bb637373c6088efaf219fed4a016 (patch)
tree6f0bddbf0276e4446beb9229c61f310cbce5a834
parent3a8203c366d46ec2937a601868f5e2ed591c923e (diff)
downloadbiboumi-dc5ad49b4011bb637373c6088efaf219fed4a016.tar.gz
biboumi-dc5ad49b4011bb637373c6088efaf219fed4a016.tar.bz2
biboumi-dc5ad49b4011bb637373c6088efaf219fed4a016.tar.xz
biboumi-dc5ad49b4011bb637373c6088efaf219fed4a016.zip
Avoid building test_suite when we make install
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--CMakeLists.txt4
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 807e8ba..63ee909 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ variables:
script:
- "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}
- - make -j$(nproc || echo 1)
+ - make everything -j$(nproc || echo 1)
- make coverage_check -j$(nproc || echo 1)
artifacts:
expire_in: 8 hours
@@ -145,7 +145,6 @@ test:freebsd:
stage: test
script:
- cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- - make
- make check
- make e2e
@@ -231,7 +230,7 @@ coverity:
script:
- export PATH=$PATH:~/coverity/bin
- 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
- 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: []
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 581782e..9458f00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,6 +228,7 @@ add_executable(test_suite ${source_tests}
$<TARGET_OBJECTS:irc>
$<TARGET_OBJECTS:identd>
$<TARGET_OBJECTS:database>)
+set_target_properties(test_suite PROPERTIES EXCLUDE_FROM_ALL TRUE)
#
## Link the executables with their libraries
@@ -298,8 +299,10 @@ endif()
#
add_custom_target(check COMMAND "test_suite"
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/"
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/"
DEPENDS biboumi)
if(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -323,6 +326,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
endif()
+add_custom_target(everything DEPENDS test_suite biboumi)
#
## Install target