[Cmake-commits] CMake branch, next, updated. v2.8.1-1223-g6866ce4

[cmake-commits at cmake.org]

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  6866ce40729604c69e078a815ddf5c085d3eefe9 (commit)
       via  fa3c1817b13362ef10e332e384553df33fb21d97 (commit)
      from  fa81b760087a8adda32fe127a8316f880e8efd70 (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=6866ce40729604c69e078a815ddf5c085d3eefe9
commit 6866ce40729604c69e078a815ddf5c085d3eefe9
Merge: fa81b76 fa3c181
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Thu May 20 09:24:55 2010 -0400

    Merge branch 'CTestScheduler' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa3c1817b13362ef10e332e384553df33fb21d97
commit fa3c1817b13362ef10e332e384553df33fb21d97
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Wed May 19 11:20:30 2010 -0400

    Cost-based test scheduling should only be done in parallel mode.

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);
       }
     }
 }

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

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake