[Cmake-commits] CMake branch, next, updated. v3.0.0-3887-g22cd130

[Bill Hoffman]

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  22cd13005088eae3fbec2cee413113f614c70c9f (commit)
       via  99381423f6411f73d798354d13ef1584ec24cf8c (commit)
      from  c0508c48707236c275d13a07f92cfd53227ce915 (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=22cd13005088eae3fbec2cee413113f614c70c9f
commit 22cd13005088eae3fbec2cee413113f614c70c9f
Merge: c0508c4 9938142
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jun 24 13:38:12 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 24 13:38:12 2014 -0400

    Merge topic 'launcher-limit-warnings-errors' into next
    
    99381423 Teach the launcher code to honer the max warnings and errors.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99381423f6411f73d798354d13ef1584ec24cf8c
commit 99381423f6411f73d798354d13ef1584ec24cf8c
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jun 24 13:35:35 2014 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Jun 24 13:35:35 2014 -0400

    Teach the launcher code to honer the max warnings and errors.
    
    The ctest launcher code did not respect the number of errors
    and warnings limits.  This patch fixes that.

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:
 Source/CTest/cmCTestBuildHandler.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake