diff options
| author | David Cole <david.cole@kitware.com> | 2009-10-15 16:07:14 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-10-15 16:07:14 (GMT) |
| commit | d03c6d970fc3569ef017ebb20c09bac40ae04416 (patch) | |
| tree | 6b1c3fbd47c71786bd64b6aaba2196b06ba91472 | |
| parent | 727fa7bcb65e21cb84f358efa0bea4bcca0286a8 (diff) | |
| download | CMake-d03c6d970fc3569ef017ebb20c09bac40ae04416.zip CMake-d03c6d970fc3569ef017ebb20c09bac40ae04416.tar.gz CMake-d03c6d970fc3569ef017ebb20c09bac40ae04416.tar.bz2 | |
Use LABELS in some ctest_coverage calls to increase coverage in cmCTestCoverageHandler.cxx.
| -rw-r--r-- | Tests/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Tests/CTestTestFailedSubmits/test.cmake.in | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index a3fb41e..fea92c3 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -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}|Submission method .xmlrpc. not compiled into CTest)") + set(ctest_coverage_labels_args "") + 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} "${CMake_SOURCE_DIR}/Tests/CTestTest/SmallAndFast" "${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/${drop_method}" diff --git a/Tests/CTestTestFailedSubmits/test.cmake.in b/Tests/CTestTestFailedSubmits/test.cmake.in index ef723c9..5fa25b0 100644 --- a/Tests/CTestTestFailedSubmits/test.cmake.in +++ b/Tests/CTestTestFailedSubmits/test.cmake.in @@ -37,7 +37,7 @@ CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" CTEST_BUILD(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_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 # not a valid drop location given above... |