Merge branch 'CTestScheduler'

1 files changed, 15 insertions, 6 deletions

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index c1ca9ea..8a69780 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -453,15 +453,24 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
   for(TestMap::iterator i = this->Tests.begin();
       i != this->Tests.end(); ++i)
     {
-    std::string name = this->Properties[i->first]->Name;
-    if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
-       name) != this->LastTestsFailed.end())
+    //We only want to schedule them by cost in a parallel situation
+    if(this->ParallelLevel > 1)
       {
-      this->TestCosts[FLT_MAX].insert(i->first);
+      std::string name = this->Properties[i->first]->Name;
+      if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
+         name) != this->LastTestsFailed.end())
+        {
+        this->TestCosts[FLT_MAX].insert(i->first);
+        }
+      else
+        {
+        this->TestCosts[this->Properties[i->first]->Cost].insert(i->first);
+        }
       }
-    else
+    else //we ignore their cost
       {
-      this->TestCosts[this->Properties[i->first]->Cost].insert(i->first);
+      this->TestCosts[this->Tests.size()
+        - this->Properties[i->first]->Index].insert(i->first);
       }
     }
 }