Use <TARGET_FILE> expression to run ctest so it works with Xcode and VS IDE.

Also add -crlf to the .gitconfig to handle the coverage data.
This commit is contained in:
Bill Hoffman 2012-05-02 11:51:38 -04:00
parent 62f6bce7a5
commit 220afcaf84
3 changed files with 10 additions and 26 deletions

View File

@ -1719,14 +1719,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
"${CMake_BINARY_DIR}/Testing/MumpsCoverage/gtm_coverage.mcov")
file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA"
DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCoverage")
set(_MUMPS_TEST_DIR MumpsCoverage)
configure_file(
"${CMake_SOURCE_DIR}/Tests/MumpsCoverage/RunTest.ctest.in"
"${CMake_BINARY_DIR}/Testing/MumpsCoverage/RunTest.ctest"
@ONLY)
add_test(CTestGTMCoverage
${CMAKE_CTEST_COMMAND}
-S ${CMake_BINARY_DIR}/Testing/MumpsCoverage/RunTest.ctest)
add_test(NAME CTestGTMCoverage
COMMAND cmake -E chdir
${CMake_BINARY_DIR}/Testing/MumpsCoverage
$<TARGET_FILE:ctest> -T Coverage --debug)
set_tests_properties(CTestGTMCoverage PROPERTIES
PASS_REGULAR_EXPRESSION
"Process file.*XINDEX.m.*Total LOC:.*127.*Percentage Coverage: 85.83.*")
@ -1739,14 +1735,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
"${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage/cache_coverage.cmcov")
file(COPY "${CMake_SOURCE_DIR}/Tests/MumpsCoverage/VistA-FOIA"
DESTINATION "${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage")
set(_MUMPS_TEST_DIR MumpsCacheCoverage)
configure_file(
"${CMake_SOURCE_DIR}/Tests/MumpsCoverage/RunTest.ctest.in"
"${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage/RunTest.ctest"
@ONLY)
add_test(CTestCacheCoverage
${CMAKE_CTEST_COMMAND}
-S ${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage/RunTest.ctest)
add_test(NAME CTestCacheCoverage
COMMAND cmake -E chdir
${CMake_BINARY_DIR}/Testing/MumpsCacheCoverage
$<TARGET_FILE:ctest> -T Coverage --debug)
set_tests_properties(CTestCacheCoverage PROPERTIES
PASS_REGULAR_EXPRESSION
"Process file.*XINDEX.m.*Total LOC:.*125.*Percentage Coverage: 85.60.*")

View File

@ -1,2 +1,2 @@
*.cmcov -whitespace
*.mcov -whitespace
*.cmcov -crlf -whitespace
*.mcov -crlf -whitespace

View File

@ -1,8 +0,0 @@
execute_process(COMMAND "@CMAKE_CTEST_COMMAND@" -T Coverage --debug
WORKING_DIRECTORY "@CMake_BINARY_DIR@/Testing/@_MUMPS_TEST_DIR@"
RESULT_VARIABLE RES)
if(${RES} EQUAL 0)
message("Test passed")
else()
message(FATAL_ERROR "Error code running ctest=${RES}")
endif()