[Cmake-commits] CMake branch, next, updated. v2.8.1-1217-g1cab21c

[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  1cab21c61572ff585141a8dd03bb6b0c61644972 (commit)
      from  0c859e8d4e9966e7a818756ce379b561da194b2b (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=1cab21c61572ff585141a8dd03bb6b0c61644972
commit 1cab21c61572ff585141a8dd03bb6b0c61644972
Author: Brad King <brad.king at kitware.com>
Date:   Wed May 19 09:22:17 2010 -0400

    Revert "Cost-based test scheduling should only be done in parallel mode."
    
    This reverts commit 0c859e8d4e9966e7a818756ce379b561da194b2b.
    The work should not be based on next.

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 8a69780..c1ca9ea 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -453,24 +453,15 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
   for(TestMap::iterator i = this->Tests.begin();
       i != this->Tests.end(); ++i)
     {
-    //We only want to schedule them by cost in a parallel situation
-    if(this->ParallelLevel > 1)
+    std::string name = this->Properties[i->first]->Name;
+    if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
+       name) != this->LastTestsFailed.end())
       {
-      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);
-        }
+      this->TestCosts[FLT_MAX].insert(i->first);
       }
-    else //we ignore their cost
+    else
       {
-      this->TestCosts[this->Tests.size()
-        - this->Properties[i->first]->Index].insert(i->first);
+      this->TestCosts[this->Properties[i->first]->Cost].insert(i->first);
       }
     }
 }
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index d2742ec..b9cee6c 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1036,9 +1036,9 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
   
   bool randomSchedule = this->CTest->GetScheduleType() == "Random";
   if(randomSchedule)
-    {
+  {
     srand((unsigned)time(0));
-    }
+  }
 
   for (ListOfTests::iterator it = this->TestList.begin();
        it != this->TestList.end(); ++it)

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

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx |   21 ++++++---------------
 Source/CTest/cmCTestTestHandler.cxx         |    4 ++--
 2 files changed, 8 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake