[Cmake-commits] CMake branch, next, updated. v2.8.1-1484-gf8370df

[Zach Mullen]

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  f8370df82654be256ddc879a4313d7f7b8c33ce6 (commit)
       via  1a4c0c55c765bf074943702722baa39decb82c3a (commit)
      from  2563b770c24a3bd2284e839e65b1a98893d24962 (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=f8370df82654be256ddc879a4313d7f7b8c33ce6
commit f8370df82654be256ddc879a4313d7f7b8c33ce6
Merge: 2563b77 1a4c0c5
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Wed Jun 23 17:19:19 2010 -0400

    Merge branch 'fix-ctest-parallel' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a4c0c55c765bf074943702722baa39decb82c3a
commit 1a4c0c55c765bf074943702722baa39decb82c3a
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Wed Jun 23 17:18:59 2010 -0400

    Parallel CTest hangs if serial test has depends

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 9b8cef5..1eb84e8 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -92,6 +92,7 @@ void cmCTestMultiProcessHandler::StartTestProcess(int test)
   this->TestRunningMap[test] = true; // mark the test as running
   // now remove the test itself
   this->EraseTest(test);
+  this->RunningCount += GetProcessorsUsed(test);
 
   cmCTestRunTest* testRun = new cmCTestRunTest(this->TestHandler);
   testRun->SetIndex(test);
@@ -267,7 +268,6 @@ void cmCTestMultiProcessHandler::StartNextTests()
           return;
           }
         numToStart -= processors;
-        this->RunningCount += processors;
         }
       else
         {
diff --git a/Tests/CTestTestParallel/CMakeLists.txt b/Tests/CTestTestParallel/CMakeLists.txt
index 8fab44b..fc53f68 100644
--- a/Tests/CTestTestParallel/CMakeLists.txt
+++ b/Tests/CTestTestParallel/CMakeLists.txt
@@ -11,3 +11,5 @@ SET_TESTS_PROPERTIES(TestRunSerial1 TestRunSerial2 PROPERTIES RUN_SERIAL true)
 ADD_TEST (TestProcessorsGreaterThanMPL1 LockFile)
 ADD_TEST (TestProcessorsGreaterThanMPL2 LockFile)
 SET_TESTS_PROPERTIES(TestProcessorsGreaterThanMPL1 PROPERTIES PROCESSORS 10)
+SET_TESTS_PROPERTIES(TestProcessorsGreaterThanMPL1 PROPERTIES DEPENDS
+                     TestProcessorsGreaterThanMPL2)

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

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx |    2 +-
 Tests/CTestTestParallel/CMakeLists.txt      |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake