diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2012-05-02 15:51:38 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2012-05-02 15:51:38 (GMT) |
| commit | 220afcaf842b9df501b4235df841395878c971e8 (patch) | |
| tree | 885f9ebed20e9c62f38e8017f1457f4642caad5e | |
| parent | 62f6bce7a543a38965bfc2596afcd559e9fb7ee9 (diff) | |
| download | CMake-220afcaf842b9df501b4235df841395878c971e8.zip CMake-220afcaf842b9df501b4235df841395878c971e8.tar.gz CMake-220afcaf842b9df501b4235df841395878c971e8.tar.bz2 | |
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.
| -rw-r--r-- | Tests/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | Tests/MumpsCoverage/.gitattributes | 4 | ||||
| -rw-r--r-- | Tests/MumpsCoverage/RunTest.ctest.in | 8 |
3 files changed, 10 insertions, 26 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index fbcd97e..f2175fc 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -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.*") diff --git a/Tests/MumpsCoverage/.gitattributes b/Tests/MumpsCoverage/.gitattributes index 77a41f8..b680612 100644 --- a/Tests/MumpsCoverage/.gitattributes +++ b/Tests/MumpsCoverage/.gitattributes @@ -1,2 +1,2 @@ -*.cmcov -whitespace -*.mcov -whitespace +*.cmcov -crlf -whitespace +*.mcov -crlf -whitespace diff --git a/Tests/MumpsCoverage/RunTest.ctest.in b/Tests/MumpsCoverage/RunTest.ctest.in deleted file mode 100644 index 3f9022a..0000000 --- a/Tests/MumpsCoverage/RunTest.ctest.in +++ /dev/null @@ -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() |