[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1120-g9a91d8a

[Ben Boeckel]

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  9a91d8a80855a5db8446f73c527c28aecdf17ee3 (commit)
       via  d8589e6437451ef174fc480d0dfc4e83e49b1b30 (commit)
      from  9bb68ece44b1aa88e5bb0fbf2f053e96a2fc5a57 (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=9a91d8a80855a5db8446f73c527c28aecdf17ee3
commit 9a91d8a80855a5db8446f73c527c28aecdf17ee3
Merge: 9bb68ec d8589e6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Dec 10 17:24:13 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 10 17:24:13 2014 -0500

    Merge topic 'catch-ctest-errors-better' into next
    
    d8589e64 ctest: count errors from scripts properly


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8589e6437451ef174fc480d0dfc4e83e49b1b30
commit d8589e6437451ef174fc480d0dfc4e83e49b1b30
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Dec 10 17:22:21 2014 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Dec 10 17:22:21 2014 -0500

    ctest: count errors from scripts properly
    
    In the unlikely event that someone has a billion+ scripts (or some
    codepath returns negative numbers), we could overflow and make a pile of
    errors a non-error. This change also allows us to use flags for the
    error in the future rather than just "something went wrong".

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 749eb58..f958e7b 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -183,7 +183,7 @@ int cmCTestScriptHandler::ProcessHandler()
   for (size_t i=0; i <  this->ConfigurationScripts.size(); ++i)
     {
     // for each script run it
-    res += this->RunConfigurationScript
+    res |= this->RunConfigurationScript
       (cmSystemTools::CollapseFullPath(this->ConfigurationScripts[i]),
        this->ScriptProcessScope[i]);
     }

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

Summary of changes:
 Source/CTest/cmCTestScriptHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake