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 46ef0b60c1888683352e6106f2a49b7a372efa73 (commit)
via 324780697c5020a027efdc24bd9cc2fc926a3546 (commit)
via 8931dd6e74bce78737baaf78c9867c992829c60b (commit)
via a3f63661e67c928c465562f988e4ab103b0ec865 (commit)
via d8dcd639101de6eeccf21860c0048a6c8bb188dc (commit)
via a076b256c4786a3d86c7d3655fa26cd72761e16b (commit)
via 34ecf7088b8d08bdc5cbf2462c8f9ad72425ecf9 (commit)
via f6a9a64f16a6f79095dd3eb9563999253fa18f9f (commit)
via daf17b13d5c8694c43c3c127dedbc93a1b2a894b (commit)
from 0941fe962dedbb5395d336e4c2221df6640f594e (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=46ef0b60c1888683352e6106f2a49b7a372efa73
commit 46ef0b60c1888683352e6106f2a49b7a372efa73
Merge: 0941fe9 3247806
Author: David Cole <david.c...@kitware.com>
AuthorDate: Tue Dec 18 13:45:02 2012 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Dec 18 13:45:02 2012 -0500
Merge topic 'fix-12904-avoid-overflow' into next
3247806 CTest: Prevent creation of unbounded number of tests in ctest
(#12904)
8931dd6 CMake Nightly Date Stamp
a3f6366 CMake Nightly Date Stamp
d8dcd63 CMake Nightly Date Stamp
a076b25 CMake Nightly Date Stamp
34ecf70 CMake Nightly Date Stamp
f6a9a64 CMake Nightly Date Stamp
daf17b1 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=324780697c5020a027efdc24bd9cc2fc926a3546
commit 324780697c5020a027efdc24bd9cc2fc926a3546
Author: Casey Goodlett <casey.goodl...@kitware.com>
AuthorDate: Tue Dec 18 13:09:53 2012 -0500
Commit: David Cole <david.c...@kitware.com>
CommitDate: Tue Dec 18 13:30:34 2012 -0500
CTest: Prevent creation of unbounded number of tests in ctest (#12904)
Note it is still possible for CTest to start more than the number of
processes specified by PARALLEL_LEVEL, but this prevents the number of
tests to start from being unbounded because of overflow.
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx
b/Source/CTest/cmCTestMultiProcessHandler.cxx
index ebef1ed..76ddeea 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -248,7 +248,12 @@ bool cmCTestMultiProcessHandler::StartTest(int test)
//---------------------------------------------------------
void cmCTestMultiProcessHandler::StartNextTests()
{
- size_t numToStart = this->ParallelLevel - this->RunningCount;
+ size_t numToStart = 0;
+ if(this->RunningCount < this->ParallelLevel)
+ {
+ numToStart = this->ParallelLevel - this->RunningCount;
+ }
+
if(numToStart == 0)
{
return;
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CTest/cmCTestMultiProcessHandler.cxx | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
