[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestTestCommand.cxx 1.12 1.13 cmCTestTestCommand.h 1.11 1.12 cmCTestTestHandler.cxx 1.111 1.112

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestTestCommand.cxx cmCTestTestCommand.h 
	cmCTestTestHandler.cxx 
Log Message:
ENH: Added PARALLEL_LEVEL option to ctest_test() command.


Index: cmCTestTestCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestCommand.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** cmCTestTestCommand.h	20 Feb 2009 20:51:03 -0000	1.11
--- cmCTestTestCommand.h	2 Sep 2009 16:35:41 -0000	1.12
***************
*** 66,70 ****
        "             [INCLUDE include regex] [RETURN_VALUE res] \n" 
        "             [EXCLUDE_LABEL exclude regex] \n"
!       "             [INCLUDE_LABEL label regex] )\n"
        "Tests the given build directory and stores results in Test.xml. The "
        "second argument is a variable that will hold value. Optionally, "
--- 66,71 ----
        "             [INCLUDE include regex] [RETURN_VALUE res] \n" 
        "             [EXCLUDE_LABEL exclude regex] \n"
!       "             [INCLUDE_LABEL label regex] \n"
!       "             [PARALLEL_LEVEL level] )\n"
        "Tests the given build directory and stores results in Test.xml. The "
        "second argument is a variable that will hold value. Optionally, "
***************
*** 74,78 ****
        "to not run EXCLUDE. EXCLUDE_LABEL and INCLUDE_LABEL are regular "
        "expression for test to be included or excluded by the test "
!       "property LABEL."
        "\n"
        CTEST_COMMAND_APPEND_OPTION_DOCS;
--- 75,80 ----
        "to not run EXCLUDE. EXCLUDE_LABEL and INCLUDE_LABEL are regular "
        "expression for test 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;
***************
*** 95,98 ****
--- 97,101 ----
      ctt_EXCLUDE_LABEL,
      ctt_INCLUDE_LABEL,
+     ctt_PARALLEL_LEVEL,
      ctt_LAST
    };

Index: cmCTestTestCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestCommand.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmCTestTestCommand.cxx	10 Feb 2009 19:24:23 -0000	1.12
--- cmCTestTestCommand.cxx	2 Sep 2009 16:35:40 -0000	1.13
***************
*** 29,32 ****
--- 29,33 ----
    this->Arguments[ctt_EXCLUDE_LABEL] = "EXCLUDE_LABEL";
    this->Arguments[ctt_INCLUDE_LABEL] = "INCLUDE_LABEL";
+   this->Arguments[ctt_PARALLEL_LEVEL] = "PARALLEL_LEVEL";
    this->Arguments[ctt_LAST] = 0;
    this->Last = ctt_LAST;
***************
*** 91,94 ****
--- 92,100 ----
                         this->Values[ctt_INCLUDE_LABEL]);
      }
+   if(this->Values[ctt_PARALLEL_LEVEL])
+     {
+     handler->SetOption("ParallelLevel",
+                        this->Values[ctt_PARALLEL_LEVEL]);
+     }
    return handler;
  }

Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.111
retrieving revision 1.112
diff -C 2 -d -r1.111 -r1.112
*** cmCTestTestHandler.cxx	31 Aug 2009 14:28:39 -0000	1.111
--- cmCTestTestHandler.cxx	2 Sep 2009 16:35:42 -0000	1.112
***************
*** 496,500 ****
    // Update internal data structure from generic one
    this->SetTestsToRunInformation(this->GetOption("TestsToRunInformation"));
!   this->SetUseUnion(cmSystemTools::IsOn(this->GetOption("UseUnion")));
    const char* val;
    val = this->GetOption("LabelRegularExpression");
--- 496,504 ----
    // Update internal data structure from generic one
    this->SetTestsToRunInformation(this->GetOption("TestsToRunInformation"));
!   this->SetUseUnion(cmSystemTools::IsOn(this->GetOption("UseUnion"))); 
!   if(this->GetOption("ParallelLevel"))
!     {
!     this->CTest->SetParallelLevel(atoi(this->GetOption("ParallelLevel")));
!     }
    const char* val;
    val = this->GetOption("LabelRegularExpression");