[Cmake-commits] [cmake-commits] zach.mullen committed cmCTest.cxx 1.364 1.365 cmCTest.h 1.117 1.118
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Aug 26 12:09:09 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv2635
Modified Files:
cmCTest.cxx cmCTest.h
Log Message:
ENH: refactored ctest. All testing is now parallel. If no -j option is specified, defaults to a MP level of 1 (non parallel)
Index: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -C 2 -d -r1.117 -r1.118
*** cmCTest.h 19 Aug 2009 12:58:30 -0000 1.117
--- cmCTest.h 26 Aug 2009 16:09:06 -0000 1.118
***************
*** 137,141 ****
// how many test to run at the same time
int GetParallelLevel() { return this->ParallelLevel; }
! void SetParallelLevel(int t) { this->ParallelLevel = t; }
bool GetParallelSubprocess() { return this->ParallelSubprocess; }
--- 137,141 ----
// how many test to run at the same time
int GetParallelLevel() { return this->ParallelLevel; }
! void SetParallelLevel(int);
bool GetParallelSubprocess() { return this->ParallelSubprocess; }
Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.364
retrieving revision 1.365
diff -C 2 -d -r1.364 -r1.365
*** cmCTest.cxx 19 Aug 2009 13:24:53 -0000 1.364
--- cmCTest.cxx 26 Aug 2009 16:09:06 -0000 1.365
***************
*** 210,214 ****
{
this->ParallelSubprocess = false;
! this->ParallelLevel = 0;
this->SubmitIndex = 0;
this->ForceNewCTestProcess = false;
--- 210,214 ----
{
this->ParallelSubprocess = false;
! this->ParallelLevel = 1;
this->SubmitIndex = 0;
this->ForceNewCTestProcess = false;
***************
*** 293,296 ****
--- 293,301 ----
}
+ void cmCTest::SetParallelLevel(int level)
+ {
+ this->ParallelLevel = level < 1 ? 1 : level;
+ }
+
//----------------------------------------------------------------------------
cmCTest::Part cmCTest::GetPartFromName(const char* name)
More information about the Cmake-commits
mailing list