[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestMemCheckCommand.h 1.8 1.9 cmCTestMultiProcessHandler.cxx 1.12 1.13 cmCTestRunTest.cxx 1.11 1.12 cmCTestTestHandler.cxx 1.112 1.113 cmCTestTestHandler.h 1.44 1.45

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestMemCheckCommand.h cmCTestMultiProcessHandler.cxx 
	cmCTestRunTest.cxx cmCTestTestHandler.cxx cmCTestTestHandler.h 
Log Message:
ENH: Added PARALLEL_LEVEL option for ctest_memcheck().  Added PROCESSORS option to set_tests_properties (implementation to come).


Index: cmCTestRunTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunTest.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** cmCTestRunTest.cxx	2 Sep 2009 14:08:39 -0000	1.11
--- cmCTestRunTest.cxx	3 Sep 2009 14:47:14 -0000	1.12
***************
*** 438,442 ****
    if ( this->TestHandler->MemCheck )
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "Memory Check");
      }
    else
--- 438,442 ----
    if ( this->TestHandler->MemCheck )
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "MemCheck");
      }
    else

Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmCTestMultiProcessHandler.cxx	2 Sep 2009 20:32:43 -0000	1.12
--- cmCTestMultiProcessHandler.cxx	3 Sep 2009 14:47:14 -0000	1.13
***************
*** 75,82 ****
  {
    for(cmCTest::CTestConfigurationMap::iterator i =
!     this->CTest->CTestConfiguration.begin();
!     i != this->CTest->CTestConfiguration.end(); ++i)
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, i->first
                 << " = " << i->second << std::endl);
      }
--- 75,82 ----
  {
    for(cmCTest::CTestConfigurationMap::iterator i =
!       this->CTest->CTestConfiguration.begin();
!       i != this->CTest->CTestConfiguration.end(); ++i)
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, i->first 
                 << " = " << i->second << std::endl);
      }
***************
*** 162,165 ****
--- 162,168 ----
        i !=  tests.end(); ++i)
      {
+     int processors = this->Properties[i->first]->Processors;
+     
+ //    if(processors > )
      // start test should start only one test
      if(this->StartTest(i->first))

Index: cmCTestTestHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C 2 -d -r1.44 -r1.45
*** cmCTestTestHandler.h	2 Sep 2009 14:08:39 -0000	1.44
--- cmCTestTestHandler.h	3 Sep 2009 14:47:14 -0000	1.45
***************
*** 99,102 ****
--- 99,104 ----
      double Timeout;
      int Index;
+     //Requested number of process slots
+     int Processors;
      std::vector<std::string> Environment;
      std::vector<std::string> Labels;

Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.112
retrieving revision 1.113
diff -C 2 -d -r1.112 -r1.113
*** cmCTestTestHandler.cxx	2 Sep 2009 16:35:42 -0000	1.112
--- cmCTestTestHandler.cxx	3 Sep 2009 14:47:14 -0000	1.113
***************
*** 1983,1986 ****
--- 1983,1994 ----
                }
              }
+           if ( key == "PROCESSORS" )
+             {
+             rtit->Processors = atoi(val.c_str());
+             if(rtit->Processors < 1)
+               {
+               rtit->Processors = 1;
+               }
+             }
            if ( key == "DEPENDS" )
              {
***************
*** 2110,2113 ****
--- 2118,2122 ----
    test.WillFail = false;
    test.Timeout = 0;
+   test.Processors = 1;
    if (this->UseIncludeRegExpFlag &&
      !this->IncludeTestsRegularExpression.find(testname.c_str()))

Index: cmCTestMemCheckCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMemCheckCommand.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** cmCTestMemCheckCommand.h	31 Aug 2009 15:32:39 -0000	1.8
--- cmCTestMemCheckCommand.h	3 Sep 2009 14:47:14 -0000	1.9
***************
*** 68,72 ****
        "             [INCLUDE include regex] \n" 
        "             [EXCLUDE_LABEL exclude regex] \n"
!       "             [INCLUDE_LABEL label regex] )\n"
        "Tests the given build directory and stores results in MemCheck.xml. "
        "The second argument is a variable that will hold value. Optionally, "
--- 68,73 ----
        "             [INCLUDE include regex] \n" 
        "             [EXCLUDE_LABEL exclude regex] \n"
!       "             [INCLUDE_LABEL label regex] \n"
!       "             [PARALLEL_LEVEL level] )\n"
        "Tests the given build directory and stores results in MemCheck.xml. "
        "The second argument is a variable that will hold value. Optionally, "
***************
*** 76,80 ****
        "not to run EXCLUDE. EXCLUDE_LABEL and INCLUDE_LABEL are regular "
        "expressions for tests to be included or excluded by the test "
!       "property LABEL."
        "\n"
        CTEST_COMMAND_APPEND_OPTION_DOCS;
--- 77,82 ----
        "not to run EXCLUDE. EXCLUDE_LABEL and INCLUDE_LABEL are regular "
        "expressions for tests to be included or excluded by the test "
!       "property LABEL. PARALLEL_LEVEL should be set to a positive number "
!       "representing the number of tests to be run in parallel."
        "\n"
        CTEST_COMMAND_APPEND_OPTION_DOCS;