summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Mullen <zach.mullen@kitware.com>2009-09-03 15:14:13 (GMT)
committerZach Mullen <zach.mullen@kitware.com>2009-09-03 15:14:13 (GMT)
commit20713ab89de358540a19cb07b13202d4298fe393 (patch)
tree8432ed7a24e5d68f2a5714166fc32bf05a15eefa
parentcd147f0f71e1f426351d4705537deff0b89c215b (diff)
downloadCMake-20713ab89de358540a19cb07b13202d4298fe393.zip
CMake-20713ab89de358540a19cb07b13202d4298fe393.tar.gz
CMake-20713ab89de358540a19cb07b13202d4298fe393.tar.bz2
Fixed warnings
-rw-r--r--Source/CTest/cmCTestMultiProcessHandler.cxx2
-rw-r--r--Source/CTest/cmCTestTestCommand.h2
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx5
-rw-r--r--Source/CTest/cmCTestTestHandler.h1
-rw-r--r--Source/cmSetTestsPropertiesCommand.h7
5 files changed, 13 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 0f7cd3c..f0d926c 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -161,7 +161,7 @@ void cmCTestMultiProcessHandler::StartNextTests()
for(TestMap::iterator i = tests.begin();
i != tests.end(); ++i)
{
- int processors = this->Properties[i->first]->Processors;
+ //int processors = this->Properties[i->first]->Processors;
// if(processors > )
// start test should start only one test
diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h
index f294e02..9f3a2f4 100644
--- a/Source/CTest/cmCTestTestCommand.h
+++ b/Source/CTest/cmCTestTestCommand.h
@@ -66,7 +66,7 @@ public:
" [INCLUDE include regex] [RETURN_VALUE res] \n"
" [EXCLUDE_LABEL exclude 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 "
"second argument is a variable that will hold value. Optionally, "
"you can specify the starting test number START, the ending test number "
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 94008d1..34b4192 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1969,6 +1969,10 @@ bool cmCTestTestHandler::SetTestsProperties(
{
rtit->Timeout = atof(val.c_str());
}
+ if ( key == "EXPENSIVE" )
+ {
+ rtit->Expensive = cmSystemTools::IsOn(val.c_str());
+ }
if ( key == "FAIL_REGULAR_EXPRESSION" )
{
std::vector<std::string> lval;
@@ -2116,6 +2120,7 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
test.IsInBasedOnREOptions = true;
test.WillFail = false;
+ test.Expensive = false;
test.Timeout = 0;
test.Processors = 1;
if (this->UseIncludeRegExpFlag &&
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index 899a638..e4b5e07 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -96,6 +96,7 @@ public:
std::map<cmStdString, cmStdString> Measurements;
bool IsInBasedOnREOptions;
bool WillFail;
+ bool Expensive;
double Timeout;
int Index;
//Requested number of process slots
diff --git a/Source/cmSetTestsPropertiesCommand.h b/Source/cmSetTestsPropertiesCommand.h
index 1644abe..f93d9dc 100644
--- a/Source/cmSetTestsPropertiesCommand.h
+++ b/Source/cmSetTestsPropertiesCommand.h
@@ -68,10 +68,13 @@ public:
"specified regular expressions, the test will fail.\n"
" Example: PASS_REGULAR_EXPRESSION \"[^a-z]Error;ERROR;Failed\"\n"
"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 "
"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);