[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestCommand.cxx 1.10 1.11 cmCTestTestCommand.h 1.6 1.7
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Sep 9 11:44:18 EDT 2008
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv12299
Modified Files:
cmCTestTestCommand.cxx cmCTestTestCommand.h
Log Message:
BUG: 0007569 add ability to do -R/-E in ctest_test command
Index: cmCTestTestCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestCommand.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** cmCTestTestCommand.h 29 Mar 2006 17:01:24 -0000 1.6
--- cmCTestTestCommand.h 9 Sep 2008 15:44:16 -0000 1.7
***************
*** 45,49 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_TEST";}
/**
--- 45,49 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_test";}
/**
***************
*** 61,67 ****
{
return
! " CTEST_TEST([BUILD build_dir] [RETURN_VALUE res])\n"
"Tests the given build directory and stores results in Test.xml. The "
! "second argument is a variable that will hold value.";
}
--- 61,74 ----
{
return
! " CTEST_TEST([BUILD build_dir]\n"
! " [START start number] [END end number]\n"
! " [STRIDE stride number] [EXCLUDE exclude regex ]\n"
! " [INCLUDE include regex] [RETURN_VALUE res] )\n"
"Tests the given build directory and stores results in Test.xml. The "
! "second argument is a variable that will hold value. Optionally, "
! "you can specify the starting test number START, the ending test number "
! "END, the number of tests to skip between each test STRIDE, a regular "
! "expression for tests to run INCLUDE, or a regular expression for tests "
! "to not run EXCLUDE.";
}
***************
*** 78,81 ****
--- 85,90 ----
ctt_END,
ctt_STRIDE,
+ ctt_EXCLUDE,
+ ctt_INCLUDE,
ctt_LAST
};
Index: cmCTestTestCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestCommand.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** cmCTestTestCommand.cxx 15 Mar 2006 16:02:08 -0000 1.10
--- cmCTestTestCommand.cxx 9 Sep 2008 15:44:16 -0000 1.11
***************
*** 25,28 ****
--- 25,30 ----
this->Arguments[ctt_END] = "END";
this->Arguments[ctt_STRIDE] = "STRIDE";
+ this->Arguments[ctt_EXCLUDE] = "EXCLUDE";
+ this->Arguments[ctt_INCLUDE] = "INCLUDE";
this->Arguments[ctt_LAST] = 0;
this->Last = ctt_LAST;
***************
*** 69,72 ****
--- 71,82 ----
testsToRunString.str().c_str());
}
+ if(this->Values[ctt_EXCLUDE])
+ {
+ handler->SetOption("ExcludeRegularExpression", this->Values[ctt_EXCLUDE]);
+ }
+ if(this->Values[ctt_INCLUDE])
+ {
+ handler->SetOption("IncludeRegularExpression", this->Values[ctt_INCLUDE]);
+ }
return handler;
}
More information about the Cmake-commits
mailing list