Merge topic 'ci_log_cdash_buildid'

b59913fad Log CDash build ids from each step of the build process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2090
This commit is contained in:
Robert Maynard 2020-05-14 12:49:22 +00:00 committed by Kitware Robot
commit 22f440ae56
4 changed files with 21 additions and 5 deletions

@ -24,7 +24,14 @@ ctest_build(APPEND
RETURN_VALUE build_result)
if(NOT DEFINED ENV{GITLAB_CI_EMULATION})
ctest_submit(PARTS Build)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
ctest_submit(PARTS Build BUILD_ID build_id)
message(STATUS "Build submission build_id: ${build_id}")
else()
ctest_submit(PARTS Build)
endif()
endif()
if (build_result)

@ -38,8 +38,15 @@ ctest_configure(APPEND
# We can now submit because we've configured.
if(NOT DEFINED ENV{GITLAB_CI_EMULATION})
ctest_submit(PARTS Update)
ctest_submit(PARTS Configure)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
ctest_submit(PARTS Update BUILD_ID build_id)
message(STATUS "Update submission build_id: ${build_id}")
ctest_submit(PARTS Configure BUILD_ID build_id)
message(STATUS "Configure submission build_id: ${build_id}")
else()
ctest_submit(PARTS Update)
ctest_submit(PARTS Configure)
endif()
endif()
if (configure_result)

@ -48,7 +48,8 @@ ctest_memcheck(
EXCLUDE "${test_exclusions}"
DEFECT_COUNT defects)
ctest_submit(PARTS Memcheck)
ctest_submit(PARTS Memcheck BUILD_ID build_id)
message(STATUS "Memcheck submission build_id: ${build_id}")
if (defects)
message(FATAL_ERROR "Found ${defects} memcheck defects")

@ -35,7 +35,8 @@ ctest_test(APPEND
)
if(NOT DEFINED ENV{GITLAB_CI_EMULATION})
ctest_submit(PARTS Test)
ctest_submit(PARTS Test BUILD_ID build_id)
message(STATUS "Test submission build_id: ${build_id}")
endif()
if (test_result)