[Cmake-commits] CMake branch, next, updated. v3.0.0-3922-ge683468

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e683468eac180aeec7385d30ebffa429ed089b8e (commit)
       via  f730313143e6d8314ee11692ee04358ed86354d0 (commit)
      from  848ad3410af396124bea05776d0fa5ceae7f3248 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e683468eac180aeec7385d30ebffa429ed089b8e
commit e683468eac180aeec7385d30ebffa429ed089b8e
Merge: 848ad34 f730313
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 10:52:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 10:52:44 2014 -0400

    Merge topic 'launcher-limit-warnings-errors' into next
    
    f7303131 CTest: Teach the launchers to honer the max warnings and errors


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f730313143e6d8314ee11692ee04358ed86354d0
commit f730313143e6d8314ee11692ee04358ed86354d0
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jun 24 13:35:35 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 25 10:53:34 2014 -0400

    CTest: Teach the launchers to honer the max warnings and errors
    
    The ctest launcher code did not respect the number of errors and
    warnings limits.  Limit the number of launcher report fragments that we
    report in the final submission.

diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 7922c9a..2ec1365 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -605,6 +605,9 @@ void cmCTestBuildHandler::GenerateXMLLaunched(std::ostream& os)
   typedef std::set<std::string, FragmentCompare> Fragments;
   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.
   cmsys::Directory launchDir;
   launchDir.Load(this->CTestLaunchDir.c_str());
@@ -612,13 +615,15 @@ void cmCTestBuildHandler::GenerateXMLLaunched(std::ostream& os)
   for(unsigned long i=0; i < n; ++i)
     {
     const char* fname = launchDir.GetFile(i);
-    if(this->IsLaunchedErrorFile(fname))
+    if(this->IsLaunchedErrorFile(fname) && numErrorsAllowed)
       {
+      numErrorsAllowed--;
       fragments.insert(this->CTestLaunchDir + "/" + fname);
       ++this->TotalErrors;
       }
-    else if(this->IsLaunchedWarningFile(fname))
+    else if(this->IsLaunchedWarningFile(fname) && numWarningsAllowed)
       {
+      numWarningsAllowed--;
       fragments.insert(this->CTestLaunchDir + "/" + fname);
       ++this->TotalWarnings;
       }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake