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

Fix issue #5668 - use CollapseFullPath when determining if covered file is within source or binary tree. Allows gcc/gcov coverage analysis using MinGW on Windows.

Browse Source
This commit is contained in:
David Cole 2009-10-12 14:51:54 -04:00
parent 45b8f2e441
commit 4439f17b20
1 changed files with 133 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -676,6 +676,24 @@ void cmCTestCoverageHandler::PopulateCustomVectors(cmMakefile *mf)
#define fnc(s) s #define fnc(s) s
#endif #endif
//----------------------------------------------------------------------
bool IsFileInDir(const std::string &infile, const std::string &indir)
{
std::string file = cmSystemTools::CollapseFullPath(infile.c_str());
std::string dir = cmSystemTools::CollapseFullPath(indir.c_str());
if (
file.size() > dir.size() &&
(fnc(file.substr(0, dir.size())) == fnc(dir)) &&
file[dir.size()] == '/'
)
{
return true;
}
return false;
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCTestCoverageHandler::HandleGCovCoverage( int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestCoverageHandlerContainer* cont) cmCTestCoverageHandlerContainer* cont)
@ -735,16 +753,27 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
" Processing coverage (each . represents one file):" << std::endl); " Processing coverage (each . represents one file):" << std::endl);
cmCTestLog(this->CTest, HANDLER_OUTPUT, " "); cmCTestLog(this->CTest, HANDLER_OUTPUT, " ");
int file_count = 0; int file_count = 0;
// make sure output from gcov is in English! // make sure output from gcov is in English!
cmSystemTools::PutEnv("LC_ALL=POSIX"); cmSystemTools::PutEnv("LC_ALL=POSIX");
// files is a list of *.da and *.gcda files with coverage data in them.
// These are binary files that you give as input to gcov so that it will
// give us text output we can analyze to summarize coverage.
//
for ( it = files.begin(); it != files.end(); ++ it ) for ( it = files.begin(); it != files.end(); ++ it )
{ {
cmCTestLog(this->CTest, HANDLER_OUTPUT, "." << std::flush); cmCTestLog(this->CTest, HANDLER_OUTPUT, "." << std::flush);
// Call gcov to get coverage data for this *.gcda file:
//
std::string fileDir = cmSystemTools::GetFilenamePath(it->c_str()); std::string fileDir = cmSystemTools::GetFilenamePath(it->c_str());
std::string command = "\"" + gcovCommand + "\" -l -o \"" + fileDir std::string command = "\"" + gcovCommand + "\" -l -o \"" + fileDir
+ "\" \"" + *it + "\""; + "\" \"" + *it + "\"";
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str() cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
<< std::endl); << std::endl);
std::string output = ""; std::string output = "";
std::string errors = ""; std::string errors = "";
int retVal = 0; int retVal = 0;
@ -777,149 +806,151 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
<< output << std::endl << output << std::endl
<< "--------------------------------------------------------------" << "--------------------------------------------------------------"
<< std::endl); << std::endl);
std::vector<cmStdString> lines; std::vector<cmStdString> lines;
std::vector<cmStdString>::iterator line; std::vector<cmStdString>::iterator line;
// Globals for storing current source file and current gcov file;
cmSystemTools::Split(output.c_str(), lines); cmSystemTools::Split(output.c_str(), lines);
for ( line = lines.begin(); line != lines.end(); ++line) for ( line = lines.begin(); line != lines.end(); ++line)
{ {
std::string sourceFile; std::string sourceFile;
std::string gcovFile; std::string gcovFile;
cmCTestLog(this->CTest, DEBUG, "Line: [" << line->c_str() << "]" cmCTestLog(this->CTest, DEBUG, "Line: [" << line->c_str() << "]"
<< std::endl); << std::endl);
if ( line->size() == 0 ) if ( line->size() == 0 )
{ {
// Ignore empty line; probably style 2 // Ignore empty line; probably style 2
} }
else if ( st1re1.find(line->c_str()) ) else if ( st1re1.find(line->c_str()) )
{ {
if ( gcovStyle != 0 ) if ( gcovStyle == 0 )
{ {
gcovStyle = 1;
}
if ( gcovStyle != 1 ) if ( gcovStyle != 1 )
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style" cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e1"
<< std::endl); << std::endl);
cont->Error ++; cont->Error ++;
break; break;
} }
gcovStyle = 1;
}
actualSourceFile = ""; actualSourceFile = "";
sourceFile = st1re1.match(2); sourceFile = st1re1.match(2);
} }
else if ( st1re2.find(line->c_str() ) ) else if ( st1re2.find(line->c_str() ) )
{ {
if ( gcovStyle != 0 ) if ( gcovStyle == 0 )
{ {
gcovStyle = 1;
}
if ( gcovStyle != 1 ) if ( gcovStyle != 1 )
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style" cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e2"
<< std::endl); << std::endl);
cont->Error ++; cont->Error ++;
break; break;
} }
gcovStyle = 1;
}
gcovFile = st1re2.match(1); gcovFile = st1re2.match(1);
} }
else if ( st2re1.find(line->c_str() ) ) else if ( st2re1.find(line->c_str() ) )
{ {
if ( gcovStyle != 0 ) if ( gcovStyle == 0 )
{ {
gcovStyle = 2;
}
if ( gcovStyle != 2 ) if ( gcovStyle != 2 )
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style" cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e3"
<< std::endl); << std::endl);
cont->Error ++; cont->Error ++;
break; break;
} }
gcovStyle = 2;
}
actualSourceFile = ""; actualSourceFile = "";
sourceFile = st2re1.match(1); sourceFile = st2re1.match(1);
} }
else if ( st2re2.find(line->c_str() ) ) else if ( st2re2.find(line->c_str() ) )
{ {
if ( gcovStyle != 0 ) if ( gcovStyle == 0 )
{ {
gcovStyle = 2;
}
if ( gcovStyle != 2 ) if ( gcovStyle != 2 )
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style" cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e4"
<< std::endl); << std::endl);
cont->Error ++; cont->Error ++;
break; break;
} }
gcovStyle = 2;
}
} }
else if ( st2re3.find(line->c_str() ) ) else if ( st2re3.find(line->c_str() ) )
{ {
if ( gcovStyle != 0 ) if ( gcovStyle == 0 )
{ {
gcovStyle = 2;
}
if ( gcovStyle != 2 ) if ( gcovStyle != 2 )
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style" cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e5"
<< std::endl); << std::endl);
cont->Error ++; cont->Error ++;
break; break;
} }
gcovStyle = 2;
}
gcovFile = st2re3.match(2); gcovFile = st2re3.match(2);
} }
else if ( st2re4.find(line->c_str() ) ) else if ( st2re4.find(line->c_str() ) )
{ {
if ( gcovStyle != 0 ) if ( gcovStyle == 0 )
{ {
gcovStyle = 2;
}
if ( gcovStyle != 2 ) if ( gcovStyle != 2 )
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style" cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e6"
<< std::endl); << std::endl);
cont->Error ++; cont->Error ++;
break; break;
} }
gcovStyle = 2;
}
cmCTestLog(this->CTest, WARNING, "Warning: " << st2re4.match(1) cmCTestLog(this->CTest, WARNING, "Warning: " << st2re4.match(1)
<< " had unexpected EOF" << std::endl); << " had unexpected EOF" << std::endl);
} }
else if ( st2re5.find(line->c_str() ) ) else if ( st2re5.find(line->c_str() ) )
{ {
if ( gcovStyle != 0 ) if ( gcovStyle == 0 )
{ {
gcovStyle = 2;
}
if ( gcovStyle != 2 ) if ( gcovStyle != 2 )
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style" cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e7"
<< std::endl); << std::endl);
cont->Error ++; cont->Error ++;
break; break;
} }
gcovStyle = 2;
}
cmCTestLog(this->CTest, WARNING, "Warning: Cannot open file: " cmCTestLog(this->CTest, WARNING, "Warning: Cannot open file: "
<< st2re5.match(1) << std::endl); << st2re5.match(1) << std::endl);
} }
else if ( st2re6.find(line->c_str() ) ) else if ( st2re6.find(line->c_str() ) )
{ {
if ( gcovStyle != 0 ) if ( gcovStyle == 0 )
{ {
gcovStyle = 2;
}
if ( gcovStyle != 2 ) if ( gcovStyle != 2 )
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style" cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e8"
<< std::endl); << std::endl);
cont->Error ++; cont->Error ++;
break; break;
} }
gcovStyle = 2;
}
cmCTestLog(this->CTest, WARNING, "Warning: File: " << st2re6.match(1) cmCTestLog(this->CTest, WARNING, "Warning: File: " << st2re6.match(1)
<< " is newer than " << st2re6.match(2) << std::endl); << " is newer than " << st2re6.match(2) << std::endl);
@ -927,16 +958,24 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
else else
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, cmCTestLog(this->CTest, ERROR_MESSAGE,
"Unknown line: [" << line->c_str() << "]" << std::endl); "Unknown gcov output line: [" << line->c_str() << "]" << std::endl);
cont->Error ++; cont->Error ++;
//abort(); //abort();
} }
if ( !gcovFile.empty() && actualSourceFile.size() )
// If the last line of gcov output gave us a valid value for gcovFile,
// and we have an actualSourceFile, then insert a (or add to existing)
// SingleFileCoverageVector for actualSourceFile:
//
if ( !gcovFile.empty() && !actualSourceFile.empty() )
{ {
cmCTestCoverageHandlerContainer::SingleFileCoverageVector* vec cmCTestCoverageHandlerContainer::SingleFileCoverageVector& vec
= &cont->TotalCoverage[actualSourceFile]; = cont->TotalCoverage[actualSourceFile];
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " in file: "
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " in gcovFile: "
<< gcovFile << std::endl); << gcovFile << std::endl);
std::ifstream ifile(gcovFile.c_str()); std::ifstream ifile(gcovFile.c_str());
if ( ! ifile ) if ( ! ifile )
{ {
@ -969,41 +1008,45 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
// line // line
std::string prefix = nl.substr(0, 12); std::string prefix = nl.substr(0, 12);
int cov = atoi(prefix.c_str()); int cov = atoi(prefix.c_str());
// Read the line number starting at the 10th character of the gcov // Read the line number starting at the 10th character of the gcov
// output line // output line
std::string lineNumber = nl.substr(10, 5); std::string lineNumber = nl.substr(10, 5);
int lineIdx = atoi(lineNumber.c_str())-1; int lineIdx = atoi(lineNumber.c_str())-1;
if ( lineIdx >= 0 ) if ( lineIdx >= 0 )
{ {
while ( vec->size() <= while ( vec.size() <= static_cast<size_t>(lineIdx) )
static_cast<size_t>(lineIdx) )
{ {
vec->push_back(-1); vec.push_back(-1);
} }
// Initially all entries are -1 (not used). If we get coverage // Initially all entries are -1 (not used). If we get coverage
// information, increment it to 0 first. // information, increment it to 0 first.
if ( (*vec)[lineIdx] < 0 ) if ( vec[lineIdx] < 0 )
{ {
if ( cov > 0 || prefix.find("#") != prefix.npos ) if ( cov > 0 || prefix.find("#") != prefix.npos )
{ {
(*vec)[lineIdx] = 0; vec[lineIdx] = 0;
} }
} }
(*vec)[lineIdx] += cov;
vec[lineIdx] += cov;
} }
} }
} }
actualSourceFile = ""; actualSourceFile = "";
} }
if ( !sourceFile.empty() && actualSourceFile.empty() ) if ( !sourceFile.empty() && actualSourceFile.empty() )
{ {
gcovFile = ""; gcovFile = "";
// Is it in the source dir? // Is it in the source dir or the binary dir?
if ( sourceFile.size() > cont->SourceDir.size() && //
(fnc(sourceFile.substr(0, cont->SourceDir.size())) == if ( IsFileInDir(sourceFile, cont->SourceDir) )
fnc(cont->SourceDir)) &&
sourceFile[cont->SourceDir.size()] == '/' )
{ {
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " produced s: " cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " produced s: "
<< sourceFile.c_str() << std::endl); << sourceFile.c_str() << std::endl);
@ -1012,12 +1055,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
actualSourceFile actualSourceFile
= cmSystemTools::CollapseFullPath(sourceFile.c_str()); = cmSystemTools::CollapseFullPath(sourceFile.c_str());
} }
else if ( IsFileInDir(sourceFile, cont->BinaryDir) )
// Binary dir?
if ( sourceFile.size() > cont->BinaryDir.size() &&
(fnc(sourceFile.substr(0, cont->BinaryDir.size())) ==
fnc(cont->BinaryDir)) &&
sourceFile[cont->BinaryDir.size()] == '/' )
{ {
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " produced b: " cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " produced b: "
<< sourceFile.c_str() << std::endl); << sourceFile.c_str() << std::endl);
@ -1029,7 +1067,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
if ( actualSourceFile.empty() ) if ( actualSourceFile.empty() )
{ {
if ( missingFiles.find(actualSourceFile) == missingFiles.end() ) if ( missingFiles.find(sourceFile) == missingFiles.end() )
{ {
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"Something went wrong" << std::endl); "Something went wrong" << std::endl);
@ -1048,12 +1086,15 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
<< sourceFile.c_str() << sourceFile.c_str()
<< " in source dir: " << cont->SourceDir.c_str() << " in source dir: " << cont->SourceDir.c_str()
<< " or binary dir: " << cont->BinaryDir.c_str() << std::endl; << " or binary dir: " << cont->BinaryDir.c_str() << std::endl;
missingFiles.insert(actualSourceFile);
missingFiles.insert(sourceFile);
} }
} }
} }
} }
file_count ++;
file_count++;
if ( file_count % 50 == 0 ) if ( file_count % 50 == 0 )
{ {
cmCTestLog(this->CTest, HANDLER_OUTPUT, " processed: " << file_count cmCTestLog(this->CTest, HANDLER_OUTPUT, " processed: " << file_count
@ -1061,6 +1102,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, HANDLER_OUTPUT, " "); cmCTestLog(this->CTest, HANDLER_OUTPUT, " ");
} }
} }
cmSystemTools::ChangeDirectory(currentDirectory.c_str()); cmSystemTools::ChangeDirectory(currentDirectory.c_str());
return file_count; return file_count;
} }