Commit 20713ab8 authored by Zach's avatar Zach
Browse files

Fixed warnings

parent cd147f0f
...@@ -161,7 +161,7 @@ void cmCTestMultiProcessHandler::StartNextTests() ...@@ -161,7 +161,7 @@ void cmCTestMultiProcessHandler::StartNextTests()
for(TestMap::iterator i = tests.begin(); for(TestMap::iterator i = tests.begin();
i != tests.end(); ++i) i != tests.end(); ++i)
{ {
int processors = this->Properties[i->first]->Processors; //int processors = this->Properties[i->first]->Processors;
// if(processors > ) // if(processors > )
// start test should start only one test // start test should start only one test
......
...@@ -66,7 +66,7 @@ public: ...@@ -66,7 +66,7 @@ public:
" [INCLUDE include regex] [RETURN_VALUE res] \n" " [INCLUDE include regex] [RETURN_VALUE res] \n"
" [EXCLUDE_LABEL exclude regex] \n" " [EXCLUDE_LABEL exclude regex] \n"
" [INCLUDE_LABEL label regex] \n" " [INCLUDE_LABEL label regex] \n"
" [PARALLEL_LEVEL level] )\n" " [PARALLEL_LEVEL level]) \n"
"Tests the given build directory and stores results in Test.xml. The " "Tests the given build directory and stores results in Test.xml. The "
"second argument is a variable that will hold value. Optionally, " "second argument is a variable that will hold value. Optionally, "
"you can specify the starting test number START, the ending test number " "you can specify the starting test number START, the ending test number "
......
...@@ -1969,6 +1969,10 @@ bool cmCTestTestHandler::SetTestsProperties( ...@@ -1969,6 +1969,10 @@ bool cmCTestTestHandler::SetTestsProperties(
{ {
rtit->Timeout = atof(val.c_str()); rtit->Timeout = atof(val.c_str());
} }
if ( key == "EXPENSIVE" )
{
rtit->Expensive = cmSystemTools::IsOn(val.c_str());
}
if ( key == "FAIL_REGULAR_EXPRESSION" ) if ( key == "FAIL_REGULAR_EXPRESSION" )
{ {
std::vector<std::string> lval; std::vector<std::string> lval;
...@@ -2116,6 +2120,7 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args) ...@@ -2116,6 +2120,7 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
test.IsInBasedOnREOptions = true; test.IsInBasedOnREOptions = true;
test.WillFail = false; test.WillFail = false;
test.Expensive = false;
test.Timeout = 0; test.Timeout = 0;
test.Processors = 1; test.Processors = 1;
if (this->UseIncludeRegExpFlag && if (this->UseIncludeRegExpFlag &&
......
...@@ -96,6 +96,7 @@ public: ...@@ -96,6 +96,7 @@ public:
std::map<cmStdString, cmStdString> Measurements; std::map<cmStdString, cmStdString> Measurements;
bool IsInBasedOnREOptions; bool IsInBasedOnREOptions;
bool WillFail; bool WillFail;
bool Expensive;
double Timeout; double Timeout;
int Index; int Index;
//Requested number of process slots //Requested number of process slots
......
...@@ -68,10 +68,13 @@ public: ...@@ -68,10 +68,13 @@ public:
"specified regular expressions, the test will fail.\n" "specified regular expressions, the test will fail.\n"
" Example: PASS_REGULAR_EXPRESSION \"[^a-z]Error;ERROR;Failed\"\n" " Example: PASS_REGULAR_EXPRESSION \"[^a-z]Error;ERROR;Failed\"\n"
"Both PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION expect a " "Both PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION expect a "
"list of regular expressions.\n"; "list of regular expressions.\n"
"PROCESSORS: Denotes the number of processors that this test will " "PROCESSORS: Denotes the number of processors that this test will "
"require. This is typically used for MPI tests, and should be used in " "require. This is typically used for MPI tests, and should be used in "
"conjunction with the ctest_test PARALLEL_LEVEL option.\n"; "conjunction with the ctest_test PARALLEL_LEVEL option.\n"
"EXPENSIVE: If set to true, this test will be run before tests that "
"are not marked as expensive. This should be used in conjunction with "
"the ctest_test PARALLEL_LEVEL option.\n";
} }
cmTypeMacro(cmSetTestsPropertiesCommand, cmCommand); cmTypeMacro(cmSetTestsPropertiesCommand, cmCommand);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment