From 1a4c0c55c765bf074943702722baa39decb82c3a Mon Sep 17 00:00:00 2001
From: Zach Mullen <zach.mullen@kitware.com>
Date: Wed, 23 Jun 2010 17:18:59 -0400
Subject: [PATCH] Parallel CTest hangs if serial test has depends

---
 Source/CTest/cmCTestMultiProcessHandler.cxx | 2 +-
 Tests/CTestTestParallel/CMakeLists.txt      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 9b8cef5cc..1eb84e85b 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 8fab44b45..fc53f6874 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)