[Cmake-commits] CMake branch, next, updated. v2.8.12-4505-g65aa99b

[Nils Gladitz]

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  65aa99bf968f24c855008a573c4016a3ff6b7836 (commit)
       via  f58123b0b6059e17a8cee1c771af3b3e41ac58bd (commit)
      from  92a59dc8e76db94f545ade7ec3fd655e63cfef37 (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=65aa99bf968f24c855008a573c4016a3ff6b7836
commit 65aa99bf968f24c855008a573c4016a3ff6b7836
Merge: 92a59dc f58123b
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Oct 25 13:20:56 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 25 13:20:56 2013 -0400

    Merge topic 'ctest-fix-run-serial' into next
    
    f58123b CTest: fix dashboard issues associated with the ctest-fix-run-serial topic


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f58123b0b6059e17a8cee1c771af3b3e41ac58bd
commit f58123b0b6059e17a8cee1c771af3b3e41ac58bd
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Oct 23 21:47:32 2013 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Oct 25 19:11:42 2013 +0200

    CTest: fix dashboard issues associated with the ctest-fix-run-serial topic

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 3dd446b..5ca2ee9 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -470,14 +470,18 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
     priorityStack.push_back(TestSet());
     TestSet &currentSet = priorityStack.back();
 
-    for(TestSet::iterator i = previousSet.begin();
+    for(TestSet::const_iterator i = previousSet.begin();
       i != previousSet.end(); ++i)
       {
       TestSet const& dependencies = this->Tests[*i];
-      currentSet.insert(dependencies.begin(), dependencies.end());
+      for(TestSet::const_iterator j = dependencies.begin();
+        j != dependencies.end(); ++j)
+        {
+        currentSet.insert(*j);
+        }
       }
 
-    for(TestSet::iterator i = currentSet.begin();
+    for(TestSet::const_iterator i = currentSet.begin();
       i != currentSet.end(); ++i)
       {
       previousSet.erase(*i);
@@ -489,18 +493,27 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
 
   // Reverse iterate over the different dependency levels (deepest first).
   // Sort tests within each level by COST and append them to the cost list.
-  for(std::list<TestSet>::reverse_iterator i = priorityStack.rbegin();
+  for(std::list<TestSet>::const_reverse_iterator i = priorityStack.rbegin();
     i != priorityStack.rend(); ++i)
     {
-    TestSet &currentSet = *i;
+    TestSet const& currentSet = *i;
     TestComparator comp(this);
 
     TestList sortedCopy;
-    sortedCopy.insert(sortedCopy.end(), currentSet.begin(), currentSet.end());
+
+    for(TestSet::const_iterator j = currentSet.begin();
+      j != currentSet.end(); ++j)
+      {
+      sortedCopy.push_back(*j);
+      }
+
     std::stable_sort(sortedCopy.begin(), sortedCopy.end(), comp);
 
-    this->SortedTests.insert(this->SortedTests.end(),
-      sortedCopy.begin(), sortedCopy.end());
+    for(TestList::const_iterator j = sortedCopy.begin();
+      j != sortedCopy.end(); ++j)
+      {
+      this->SortedTests.push_back(*j);
+      }
     }
 }
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 0d35104..d5dec90 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2074,7 +2074,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log"
     )
 
-  ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4)
+  ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4
+    --output-on-failure -C "\${CTestTest_CONFIG}")
 
   if(NOT BORLAND)
     set(CTestLimitDashJ_EXTRA_OPTIONS --force-new-ctest-process)
diff --git a/Tests/CTestTestSerialInDepends/CMakeLists.txt b/Tests/CTestTestSerialInDepends/CMakeLists.txt
index f99acab..90e50f9 100644
--- a/Tests/CTestTestSerialInDepends/CMakeLists.txt
+++ b/Tests/CTestTestSerialInDepends/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8.12)
 
+project(CTestTestSerialInDepends)
+
 enable_testing()
 
 function(my_add_test NAME COST)

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

Summary of changes:


hooks/post-receive
-- 
CMake