[Cmake-commits] [cmake-commits] hoffman committed cmCTestMultiProcessHandler.cxx 1.2 1.3 cmCTestMultiProcessHandler.h 1.1 1.2 cmCTestTestHandler.cxx 1.75 1.76

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv16494/Source/CTest

Modified Files:
	cmCTestMultiProcessHandler.cxx cmCTestMultiProcessHandler.h 
	cmCTestTestHandler.cxx 
Log Message:
COMP: try to fix sgi compiler problem with set and also shorten symbol lengths for set class


Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** cmCTestMultiProcessHandler.cxx	3 Jul 2008 20:26:03 -0000	1.2
--- cmCTestMultiProcessHandler.cxx	4 Jul 2008 14:28:22 -0000	1.3
***************
*** 28,36 ****
    // Set the tests
  void 
! cmCTestMultiProcessHandler::SetTests(std::map<int, std::set<int> >& tests,
!                                           std::map<int,cmStdString>& testNames)
  {
    // set test run map to false for all
!   for(std::map<int, std::set<int> >::iterator i = this->Tests.begin();
        i != this->Tests.end(); ++i)
      {
--- 28,36 ----
    // Set the tests
  void 
! cmCTestMultiProcessHandler::SetTests(TestMap& tests,
!                                      std::map<int,cmStdString>& testNames)
  {
    // set test run map to false for all
!   for(TestMap::iterator i = this->Tests.begin();
        i != this->Tests.end(); ++i)
      {
***************
*** 119,127 ****
    // a test is finished it will be removed from the depend list
    // and we don't want to be iterating a list while removing from it
!   std::set<int> depends = this->Tests[test];
    size_t totalDepends = depends.size();
    if(totalDepends)
      {
!     for(std::set<int>::const_iterator i = depends.begin();
          i != depends.end(); ++i)
        {
--- 119,127 ----
    // a test is finished it will be removed from the depend list
    // and we don't want to be iterating a list while removing from it
!   TestSet depends = this->Tests[test];
    size_t totalDepends = depends.size();
    if(totalDepends)
      {
!     for(TestSet::const_iterator i = depends.begin();
          i != depends.end(); ++i)
        {
***************
*** 167,172 ****
      return;
      }
!   std::map<int, std::set<int> > tests = this->Tests;
!   for(std::map<int, std::set<int> >::iterator i = tests.begin();
        i !=  tests.end(); ++i)
      {
--- 167,172 ----
      return;
      }
!   TestMap tests = this->Tests;
!   for(TestMap::iterator i = tests.begin();
        i !=  tests.end(); ++i)
      {
***************
*** 255,259 ****
    this->TestResults->push_back(cres);
    // remove test from depend of all other tests
!   for( std::map<int, std::set<int> >::iterator i = this->Tests.begin();
         i!=  this->Tests.end(); ++i)
      {
--- 255,259 ----
    this->TestResults->push_back(cres);
    // remove test from depend of all other tests
!   for(TestMap::iterator i = this->Tests.begin();
         i!=  this->Tests.end(); ++i)
      {
***************
*** 272,280 ****
  {
  #undef cout
!   for( std::map<int, std::set<int> >::iterator i = this->Tests.begin();
         i!=  this->Tests.end(); ++i)
      {
      std::cout << "Test " << i->first << "  (";
!     for(std::set<int>::iterator j = i->second.begin(); 
          j != i->second.end(); ++j)
        {
--- 272,280 ----
  {
  #undef cout
!   for( TestMap::iterator i = this->Tests.begin();
         i!=  this->Tests.end(); ++i)
      {
      std::cout << "Test " << i->first << "  (";
!     for(TestSet::iterator j = i->second.begin(); 
          j != i->second.end(); ++j)
        {

Index: cmCTestMultiProcessHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cmCTestMultiProcessHandler.h	3 Jul 2008 13:31:31 -0000	1.1
--- cmCTestMultiProcessHandler.h	4 Jul 2008 14:28:22 -0000	1.2
***************
*** 34,40 ****
  {
  public:
    cmCTestMultiProcessHandler();
    // Set the tests
!   void SetTests(std::map<int, std::set<int> >& tests,
                  std::map<int, cmStdString>& testNames);
    // Set the max number of tests that can be run at the same time.
--- 34,42 ----
  {
  public:
+   struct TestSet : public std::set<int> {};
+   struct TestMap : public std::map<int, TestSet> {};
    cmCTestMultiProcessHandler();
    // Set the tests
!   void SetTests(TestMap& tests,
                  std::map<int, cmStdString>& testNames);
    // Set the max number of tests that can be run at the same time.
***************
*** 67,71 ****
    bool CheckOutput();
    // map from test number to set of depend tests
!   std::map<int, std::set<int> > Tests;
    std::map<int, cmStdString> TestNames;
    std::map<int, bool> TestRunningMap;
--- 69,73 ----
    bool CheckOutput();
    // map from test number to set of depend tests
!   TestMap Tests;
    std::map<int, cmStdString> TestNames;
    std::map<int, bool> TestRunningMap;

Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.75
retrieving revision 1.76
diff -C 2 -d -r1.75 -r1.76
*** cmCTestTestHandler.cxx	4 Jul 2008 14:10:30 -0000	1.75
--- cmCTestTestHandler.cxx	4 Jul 2008 14:28:22 -0000	1.76
***************
*** 1238,1243 ****
    parallel.SetCTest(this->CTest);
    parallel.SetParallelLevel(this->CTest->GetParallelLevel()); 
!   std::set<int> depends;
!   std::map<int, std::set<int> > tests; 
    std::map<int, cmStdString> testnames;
    for (ListOfTests::iterator it = this->TestList.begin();
--- 1238,1243 ----
    parallel.SetCTest(this->CTest);
    parallel.SetParallelLevel(this->CTest->GetParallelLevel()); 
!   cmCTestMultiProcessHandler::TestSet depends;
!   cmCTestMultiProcessHandler::TestMap tests;
    std::map<int, cmStdString> testnames;
    for (ListOfTests::iterator it = this->TestList.begin();