This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 33a713f5b9c7eaac90df2282280f8e5cb66be721 (commit) via 220afcaf842b9df501b4235df841395878c971e8 (commit) from 28438114233ec0c666c58284ad86c52848594959 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33a713f5b9c7eaac90df2282280f8e5cb66be721 commit 33a713f5b9c7eaac90df2282280f8e5cb66be721 Merge: 2843811 220afca Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Wed May 2 11:53:26 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed May 2 11:53:26 2012 -0400 Merge topic 'mumps_coverage' into next 220afca Use <TARGET_FILE> expression to run ctest so it works with Xcode and VS IDE. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=220afcaf842b9df501b4235df841395878c971e8 commit 220afcaf842b9df501b4235df841395878c971e8 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Wed May 2 11:51:38 2012 -0400 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Wed May 2 11:51:38 2012 -0400 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. 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() ----------------------------------------------------------------------- Summary of changes: Tests/CMakeLists.txt | 24 ++++++++---------------- Tests/MumpsCoverage/.gitattributes | 4 ++-- Tests/MumpsCoverage/RunTest.ctest.in | 8 -------- 3 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 Tests/MumpsCoverage/RunTest.ctest.in hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits