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

Merge topic 'launcher-limit-warnings-errors' 

f7303131 CTest: Teach the launchers to honer the max warnings and errors
This commit is contained in:
Brad King 2014-06-25 10:53:09 -04:00 committed by CMake Topic Stage
parent 1b40fc835e f730313143
commit 4c27c51f25
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CTest/cmCTestBuildHandler.cxx
View File

@ -605,6 +605,9 @@ void cmCTestBuildHandler::GenerateXMLLaunched(std::ostream& os)
typedef std::set<std::string, FragmentCompare> Fragments; typedef std::set<std::string, FragmentCompare> Fragments;
Fragments fragments(fragmentCompare); Fragments fragments(fragmentCompare);
// only report the first 50 warnings and first 50 errors
int numErrorsAllowed = this->MaxErrors;
int numWarningsAllowed = this->MaxWarnings;
// Identify fragments on disk. // Identify fragments on disk.
cmsys::Directory launchDir; cmsys::Directory launchDir;
launchDir.Load(this->CTestLaunchDir.c_str()); launchDir.Load(this->CTestLaunchDir.c_str());
@ -612,13 +615,15 @@ void cmCTestBuildHandler::GenerateXMLLaunched(std::ostream& os)
for(unsigned long i=0; i < n; ++i) for(unsigned long i=0; i < n; ++i)
{ {
const char* fname = launchDir.GetFile(i); const char* fname = launchDir.GetFile(i);
if(this->IsLaunchedErrorFile(fname)) if(this->IsLaunchedErrorFile(fname) && numErrorsAllowed)
{ {
numErrorsAllowed--;
fragments.insert(this->CTestLaunchDir + "/" + fname); fragments.insert(this->CTestLaunchDir + "/" + fname);
++this->TotalErrors; ++this->TotalErrors;
} }
else if(this->IsLaunchedWarningFile(fname)) else if(this->IsLaunchedWarningFile(fname) && numWarningsAllowed)
{ {
numWarningsAllowed--;
fragments.insert(this->CTestLaunchDir + "/" + fname); fragments.insert(this->CTestLaunchDir + "/" + fname);
++this->TotalWarnings; ++this->TotalWarnings;
} }