Browse Source

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

David Cole 16 years ago
parent
commit
d03c6d970f
2 changed files with 12 additions and 1 deletions
  1. 11 0
      Tests/CMakeLists.txt
  2. 1 1
      Tests/CTestTestFailedSubmits/test.cmake.in

+ 11 - 0
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}"

+ 1 - 1
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...