kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Coverage glob should search in Source dir

Browse Source
This commit is contained in:
Zach Mullen 2010-04-23 11:22:54 -04:00
parent 7049dff85a
commit 6ea9213244
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CTestCustom.cmake.in
View File

@ -66,8 +66,3 @@ SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
# Exclude Qt source files from coverage results: # Exclude Qt source files from coverage results:
"[A-Za-z]./[Qq]t/qt-.+-opensource-src" "[A-Za-z]./[Qq]t/qt-.+-opensource-src"
) )
SET(CTEST_EXTRA_COVERAGE_GLOB
*.txx
*.cxx
)

12
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -582,8 +582,10 @@ int cmCTestCoverageHandler::ProcessHandler()
for(std::set<std::string>::iterator i = uncovered.begin(); for(std::set<std::string>::iterator i = uncovered.begin();
i != uncovered.end(); ++i) i != uncovered.end(); ++i)
{ {
std::string fileName = cmSystemTools::GetFilenameName(*i);
std::string shortFileName = this->CTest->GetShortPathToFile(i->c_str()); std::string shortFileName = this->CTest->GetShortPathToFile(i->c_str());
covLogFile << "\t<File Name=\"" << cmXMLSafe(i->c_str())
covLogFile << "\t<File Name=\"" << cmXMLSafe(fileName)
<< "\" FullPath=\"" << cmXMLSafe(shortFileName) << "\">\n" << "\" FullPath=\"" << cmXMLSafe(shortFileName) << "\">\n"
<< "\t\t<Report>" << std::endl; << "\t\t<Report>" << std::endl;
@ -2026,7 +2028,7 @@ std::set<std::string> cmCTestCoverageHandler::FindUncoveredFiles(
cmsys::Glob gl; cmsys::Glob gl;
gl.RecurseOn(); gl.RecurseOn();
gl.RecurseThroughSymlinksOff(); gl.RecurseThroughSymlinksOff();
std::string glob = cont->BinaryDir + "/" + *i; std::string glob = cont->SourceDir + "/" + *i;
gl.FindFiles(glob); gl.FindFiles(glob);
std::vector<std::string> files = gl.GetFiles(); std::vector<std::string> files = gl.GetFiles();
extraMatches.insert(files.begin(), files.end()); extraMatches.insert(files.begin(), files.end());
@ -2037,7 +2039,11 @@ std::set<std::string> cmCTestCoverageHandler::FindUncoveredFiles(
for(cmCTestCoverageHandlerContainer::TotalCoverageMap::iterator i = for(cmCTestCoverageHandlerContainer::TotalCoverageMap::iterator i =
cont->TotalCoverage.begin(); i != cont->TotalCoverage.end(); ++i) cont->TotalCoverage.begin(); i != cont->TotalCoverage.end(); ++i)
{ {
extraMatches.erase(i->first); std::string shortPath = this->CTest->GetShortPathToFile(
i->first.c_str());
shortPath= shortPath.substr(2, shortPath.length() - 1);
std::string fullPath = cont->SourceDir + "/" + shortPath;
extraMatches.erase(fullPath);
} }
} }
return extraMatches; return extraMatches;