CTest: exclude /showIncludes notes when scraping logs

My last related commit e5e3f3d4 (CTest: filter /showIncludes output from
ninja compile launcher, 2013-12-01) filtered /showIncludes messages from
the generated xml output but they also need to be filtered in
ScrapeLog().  Otherwise they are being detected as warnings when using
compilers withs english diagnostics.
This commit is contained in:
Nils Gladitz 2014-02-25 11:25:41 +01:00 committed by Brad King
parent f8ccb6d038
commit 47702b8d49
2 changed files with 18 additions and 2 deletions

View File

@ -587,8 +587,7 @@ void cmCTestLaunch::DumpFileToXML(std::ostream& fxml,
while(cmSystemTools::GetLineFromStream(fin, line))
{
if(OptionFilterPrefix.size() && cmSystemTools::StringStartsWith(
line.c_str(), OptionFilterPrefix.c_str()))
if(MatchesFilterPrefix(line))
{
continue;
}
@ -676,6 +675,11 @@ bool cmCTestLaunch::ScrapeLog(std::string const& fname)
std::string line;
while(cmSystemTools::GetLineFromStream(fin, line))
{
if(MatchesFilterPrefix(line))
{
continue;
}
if(this->Match(line.c_str(), this->RegexWarning) &&
!this->Match(line.c_str(), this->RegexWarningSuppress))
{
@ -700,6 +704,17 @@ bool cmCTestLaunch::Match(std::string const& line,
return false;
}
//----------------------------------------------------------------------------
bool cmCTestLaunch::MatchesFilterPrefix(std::string const& line) const
{
if(this->OptionFilterPrefix.size() && cmSystemTools::StringStartsWith(
line.c_str(), this->OptionFilterPrefix.c_str()))
{
return true;
}
return false;
}
//----------------------------------------------------------------------------
int cmCTestLaunch::Main(int argc, const char* const argv[])
{

View File

@ -88,6 +88,7 @@ private:
bool ScrapeLog(std::string const& fname);
bool Match(std::string const& line,
std::vector<cmsys::RegularExpression>& regexps);
bool MatchesFilterPrefix(std::string const& line) const;
// Methods to generate the xml fragment.
void WriteXML();