kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use LABELS in some ctest_coverage calls to increase coverage in cmCTestCoverageHandler.cxx.

This commit is contained in:
David Cole 2009-10-15 12:07:14 -04:00
parent 727fa7bcb6
commit d03c6d970f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tests/CMakeLists.txt
View File

@ -1135,7 +1135,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)") set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest)") set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest)")
set(ctest_coverage_labels_args "")
foreach(drop_method cp ftp http https scp xmlrpc) foreach(drop_method cp ftp http https scp xmlrpc)
# Cycle through these values each time through the loop:
if(ctest_coverage_labels_args STREQUAL "")
set(ctest_coverage_labels_args "LABELS Everything")
elseif(ctest_coverage_labels_args STREQUAL "LABELS Everything")
set(ctest_coverage_labels_args "LABELS 0ArgTest")
else()
set(ctest_coverage_labels_args "")
endif()
add_failed_submit_test(CTestTestFailedSubmit-${drop_method} add_failed_submit_test(CTestTestFailedSubmit-${drop_method}
"${CMake_SOURCE_DIR}/Tests/CTestTest/SmallAndFast" "${CMake_SOURCE_DIR}/Tests/CTestTest/SmallAndFast"
"${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/${drop_method}" "${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/${drop_method}"

2
Tests/CTestTestFailedSubmits/test.cmake.in
View File

@ -37,7 +37,7 @@ CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}"
CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" @ctest_coverage_labels_args@ RETURN_VALUE res)
# ok to call ctest_submit - still avoids network activity because there is # ok to call ctest_submit - still avoids network activity because there is
# not a valid drop location given above... # not a valid drop location given above...