summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-06-15 18:07:02 (GMT)
committerBrad King <brad.king@kitware.com>2010-06-15 18:07:02 (GMT)
commite82d918322391e5f312a014c28e4d18a75b91b22 (patch)
tree790667727965198822bc50a9e01dd251448a3af9 /Source
parentba95a1f0bdbfde1f7b176eba4a49952110013359 (diff)
parent9d6567a26998024e7614c7cff322319f47526c80 (diff)
downloadCMake-e82d918322391e5f312a014c28e4d18a75b91b22.zip
CMake-e82d918322391e5f312a014c28e4d18a75b91b22.tar.gz
CMake-e82d918322391e5f312a014c28e4d18a75b91b22.tar.bz2
Merge branch 'coverage_exclusion_from_glob'
Diffstat (limited to 'Source')
-rw-r--r--Source/CTest/cmCTestCoverageHandler.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 3235bfd..55a5225 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -2038,8 +2038,12 @@ std::set<std::string> cmCTestCoverageHandler::FindUncoveredFiles(
for(std::vector<std::string>::iterator f = files.begin();
f != files.end(); ++f)
{
- extraMatches.insert(this->CTest->GetShortPathToFile(
- f->c_str()));
+ if(this->ShouldIDoCoverage(f->c_str(),
+ cont->SourceDir.c_str(), cont->BinaryDir.c_str()))
+ {
+ extraMatches.insert(this->CTest->GetShortPathToFile(
+ f->c_str()));
+ }
}
}