diff options
| -rw-r--r-- | Source/cmSetTestsPropertiesCommand.h | 17 | ||||
| -rw-r--r-- | Source/cmTest.cxx | 45 |
2 files changed, 46 insertions, 16 deletions
diff --git a/Source/cmSetTestsPropertiesCommand.h b/Source/cmSetTestsPropertiesCommand.h index bc5d91f..fbc8ac1 100644 --- a/Source/cmSetTestsPropertiesCommand.h +++ b/Source/cmSetTestsPropertiesCommand.h @@ -64,23 +64,8 @@ public: " 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" - "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" - "COST: Set this to a floating point value. Tests in a test set will be " - "run in descending order of cost.\n" "TIMEOUT: Setting this will limit the test runtime to the number of " - "seconds specified.\n" - "RUN_SERIAL: If set to true, this test will not run in parallel with " - "any other tests. This should be used in conjunction with " - "the ctest_test PARALLEL_LEVEL option.\n" - "REQUIRED_FILES: Set this to a list of files that must exist in order " - "for the test to be run.\n" - "ATTACHED_FILES: Set this property to a list of files that will be " - "encoded and submitted to the dashboard as an addition to the test " - "result.\n" - "ATTACHED_FILES_ON_FAIL: Same as ATTACHED_FILES, but these files will " - "only be included if the test does not pass.\n"; + "seconds specified.\n"; } cmTypeMacro(cmSetTestsPropertiesCommand, cmCommand); diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx index 88b0eae..b52bc19 100644 --- a/Source/cmTest.cxx +++ b/Source/cmTest.cxx @@ -97,6 +97,31 @@ void cmTest::AppendProperty(const char* prop, const char* value) void cmTest::DefineProperties(cmake *cm) { cm->DefineProperty + ("ATTACHED_FILES", cmProperty::TEST, + "Attach a list of files to a dashboard submission.", + "Set this property to a list of files that will be encoded and " + "submitted to the dashboard as an addition to the test result."); + + cm->DefineProperty + ("ATTACHED_FILES_ON_FAIL", cmProperty::TEST, + "Attach a list of files to a dashboard submission if the test fails.", + "Same as ATTACHED_FILES, but these files will only be included if the " + "test does not pass."); + + cm->DefineProperty + ("COST", cmProperty::TEST, + "Set this to a floating point value. Tests in a test set will be " + "run in descending order of cost.", "This property describes the cost " + "of a test. You can explicitly set this value; tests with higher COST " + "values will run first."); + + cm->DefineProperty + ("DEPENDS", cmProperty::TEST, + "Specifies that this test should only be run after the specified " + "list of tests.", + "Set this to a list of tests that must finish before this test is run."); + + cm->DefineProperty ("ENVIRONMENT", cmProperty::TEST, "Specify environment variables that should be defined for running " "a test.", @@ -132,6 +157,26 @@ void cmTest::DefineProperties(cmake *cm) " regular expressions has to match, otherwise the test will fail."); cm->DefineProperty + ("PROCESSORS", cmProperty::TEST, + "How many process slots this test requires", + "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."); + + cm->DefineProperty + ("REQUIRED_FILES", cmProperty::TEST, + "List of files required to run the test.", + "If set to a list of files, the test will not be run unless all of the " + "files exist."); + + cm->DefineProperty + ("RUN_SERIAL", cmProperty::TEST, + "Do not run this test in parallel with any other test.", + "Use this option in conjunction with the ctest_test PARALLEL_LEVEL " + "option to specify that this test should not be run in parallel with " + "any other tests."); + + cm->DefineProperty ("TIMEOUT", cmProperty::TEST, "How many seconds to allow for this test.", "This property if set will limit a test to not take more than " |