[Cmake-commits] CMake branch, master, updated. v2.8.8-180-g8e9101a
David Cole
david.cole at kitware.com
Thu May 17 14:58:56 EDT 2012
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, master has been updated
via 8e9101a0cb81374a619686ee820c86d0531d6372 (commit)
via c806b23cfe08259efed1ed310613f65c16a60680 (commit)
via 761d93129fb72d0418facb785776533b33d24a01 (commit)
via 5b69ce49d4d80207d8fc90fe970875b4e545c13a (commit)
via 1b418f1fbfdeea561cc175929ac677d93e523e41 (commit)
via b0c07a13d1ee034875c2067f35bd39a9ffef7954 (commit)
via 0a169e628bb222fec7deead87f6ebe8fa77c7805 (commit)
via a7abf5e090379a77f50ce2285ac4c1c99159d9d2 (commit)
via 220afcaf842b9df501b4235df841395878c971e8 (commit)
via 62f6bce7a543a38965bfc2596afcd559e9fb7ee9 (commit)
via f5c5db0753161726c6032178bb10eb41b1ddde02 (commit)
via 7955e995ec400fb063529064b6232ca0eedfe5e0 (commit)
via a86cd33cdd497acdb6b77a44c146a9779730675e (commit)
via 319eeb0247f51bb2d380261ce7d63c7ce5020ed0 (commit)
via 72210c266238607e12c12ed7e983efed557fa784 (commit)
via dd07161c512e8d520da51f8bb82a65ec29aa57ba (commit)
via e6412e084ed6ba77c17292e3e7c5b9d8e2450bab (commit)
from 8f635d0268be899286669f1a8be5da6c97671470 (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=8e9101a0cb81374a619686ee820c86d0531d6372
commit 8e9101a0cb81374a619686ee820c86d0531d6372
Merge: 8f635d0 c806b23
Author: David Cole <david.cole at kitware.com>
AuthorDate: Thu May 17 14:58:54 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 17 14:58:54 2012 -0400
Merge topic 'mumps_coverage'
c806b23 CDash now supports lots of files in coverage. So, show all files.
761d931 Do not try to run bullseye coverage if COVFILE env is empty.
5b69ce4 Update test data to match new coverage format.
1b418f1 Change GT.M Coverage Parser global
b0c07a1 Disable bullseye coverage for mumps coverage test.
0a169e6 Remove uncovered files from cache coverage data.
a7abf5e Add ability to specify more than one package directory or coverage directory.
220afca Use <TARGET_FILE> expression to run ctest so it works with Xcode and VS IDE.
62f6bce Use a script to run the test because WORKING_DIRECTORY is not in 2.8.2.
f5c5db0 Fix some warnings and a bug where it went past the length of a vector.
7955e99 Add support for Cache coverage.
a86cd33 Add virutal destructor to silence warning.
319eeb0 Add test for mumps coverage. Also refactor code to prepare for cache coverage.
72210c2 Fix line length.
dd07161 Fix warning about char* instead of const char*.
e6412e0 Add support to ctest for GTM mumps coverage.
diff --cc Source/CTest/cmCTestCoverageHandler.cxx
index 15c02b4,bb39e0d..81d3669
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@@ -751,34 -761,47 +761,74 @@@ int cmCTestCoverageHandler::HandlePHPCo
}
return static_cast<int>(cont->TotalCoverage.size());
}
+ //----------------------------------------------------------------------
+ int cmCTestCoverageHandler::HandleMumpsCoverage(
+ cmCTestCoverageHandlerContainer* cont)
+ {
+ // try gtm coverage
+ cmParseGTMCoverage cov(*cont, this->CTest);
+ std::string coverageFile = this->CTest->GetBinaryDir() +
+ "/gtm_coverage.mcov";
+ if(cmSystemTools::FileExists(coverageFile.c_str()))
+ {
+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+ "Parsing Cache Coverage: " << coverageFile
+ << std::endl);
+ cov.ReadCoverageFile(coverageFile.c_str());
+ return static_cast<int>(cont->TotalCoverage.size());
+ }
+ else
+ {
+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+ " Cannot find foobar GTM coverage file: " << coverageFile
+ << std::endl);
+ }
+ cmParseCacheCoverage ccov(*cont, this->CTest);
+ coverageFile = this->CTest->GetBinaryDir() +
+ "/cache_coverage.cmcov";
+ if(cmSystemTools::FileExists(coverageFile.c_str()))
+ {
+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+ "Parsing Cache Coverage: " << coverageFile
+ << std::endl);
+ ccov.ReadCoverageFile(coverageFile.c_str());
+ }
+ else
+ {
+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+ " Cannot find Cache coverage file: " << coverageFile
+ << std::endl);
+ }
+ return static_cast<int>(cont->TotalCoverage.size());
+ }
+struct cmCTestCoverageHandlerLocale
+{
+ cmCTestCoverageHandlerLocale()
+ {
+ if(const char* l = cmSystemTools::GetEnv("LC_ALL"))
+ {
+ lc_all = l;
+ }
+ if(lc_all != "C")
+ {
+ cmSystemTools::PutEnv("LC_ALL=C");
+ }
+ }
+ ~cmCTestCoverageHandlerLocale()
+ {
+ if(!lc_all.empty())
+ {
+ cmSystemTools::PutEnv(("LC_ALL=" + lc_all).c_str());
+ }
+ else
+ {
+ cmSystemTools::UnsetEnv("LC_ALL");
+ }
+ }
+ std::string lc_all;
+};
+
//----------------------------------------------------------------------
int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestCoverageHandlerContainer* cont)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 3 +
Source/CTest/cmCTestCoverageHandler.cxx | 52 +-
Source/CTest/cmCTestCoverageHandler.h | 2 +
Source/CTest/cmParseCacheCoverage.cxx | 220 +++
Source/CTest/cmParseCacheCoverage.h | 42 +
Source/CTest/cmParseGTMCoverage.cxx | 272 ++++
Source/CTest/cmParseGTMCoverage.h | 49 +
Source/CTest/cmParseMumpsCoverage.cxx | 165 +++
Source/CTest/cmParseMumpsCoverage.h | 52 +
Source/CTest/cmParsePHPCoverage.h | 3 -
Tests/CMakeLists.txt | 36 +
Tests/MumpsCoverage/.gitattributes | 2 +
Tests/MumpsCoverage/Accounts_ReceivableTest.cmcov | 304 ++++
Tests/MumpsCoverage/Accounts_ReceivableTest.mcov | 1445 ++++++++++++++++++++
Tests/MumpsCoverage/DartConfiguration.cache.tcl.in | 8 +
Tests/MumpsCoverage/DartConfiguration.tcl.in | 8 +
.../VistA-FOIA/Packages/Toolkit/Routines/XINDEX.m | 144 ++
Tests/MumpsCoverage/cache_coverage.cmcov.in | 2 +
Tests/MumpsCoverage/gtm_coverage.mcov.in | 2 +
19 files changed, 2807 insertions(+), 4 deletions(-)
create mode 100644 Source/CTest/cmParseCacheCoverage.cxx
create mode 100644 Source/CTest/cmParseCacheCoverage.h
create mode 100644 Source/CTest/cmParseGTMCoverage.cxx
create mode 100644 Source/CTest/cmParseGTMCoverage.h
create mode 100644 Source/CTest/cmParseMumpsCoverage.cxx
create mode 100644 Source/CTest/cmParseMumpsCoverage.h
create mode 100644 Tests/MumpsCoverage/.gitattributes
create mode 100644 Tests/MumpsCoverage/Accounts_ReceivableTest.cmcov
create mode 100644 Tests/MumpsCoverage/Accounts_ReceivableTest.mcov
create mode 100644 Tests/MumpsCoverage/DartConfiguration.cache.tcl.in
create mode 100644 Tests/MumpsCoverage/DartConfiguration.tcl.in
create mode 100644 Tests/MumpsCoverage/VistA-FOIA/Packages/Toolkit/Routines/XINDEX.m
create mode 100644 Tests/MumpsCoverage/cache_coverage.cmcov.in
create mode 100644 Tests/MumpsCoverage/gtm_coverage.mcov.in
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list