[Cmake-commits] [cmake-commits] zach.mullen committed cmSetTestsPropertiesCommand.h 1.17 1.18 cmTest.cxx 1.17 1.18

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv3336

Modified Files:
	cmSetTestsPropertiesCommand.h cmTest.cxx 
Log Message:
Move documentation for new set_tests_properties properties.


Index: cmSetTestsPropertiesCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSetTestsPropertiesCommand.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** cmSetTestsPropertiesCommand.h	16 Dec 2009 19:50:16 -0000	1.17
--- cmSetTestsPropertiesCommand.h	17 Dec 2009 19:34:46 -0000	1.18
***************
*** 65,85 ****
        "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";
      }
  
--- 65,70 ----
        "Both PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION expect a "
        "list of regular expressions.\n"
        "TIMEOUT: Setting this will limit the test runtime to the number of "
!       "seconds specified.\n";
      }
  

Index: cmTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTest.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** cmTest.cxx	28 Sep 2009 15:42:49 -0000	1.17
--- cmTest.cxx	17 Dec 2009 19:34:47 -0000	1.18
***************
*** 98,101 ****
--- 98,126 ----
  {
    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 "
***************
*** 133,136 ****
--- 158,181 ----
  
    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.",