summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-30 13:01:00 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-03-30 13:01:06 (GMT)
commit1cc918a770bf6dc763b593df39946667dc572c7d (patch)
tree4cd1343f322d7ccaadb848fdda49dc046a2a6af0 /Help/manual
parenta820327d1ae7c32df46cfa5b3caf56184d46eb72 (diff)
parentb070947dffd141d50227c59feed4c3d784b39157 (diff)
downloadCMake-1cc918a770bf6dc763b593df39946667dc572c7d.zip
CMake-1cc918a770bf6dc763b593df39946667dc572c7d.tar.gz
CMake-1cc918a770bf6dc763b593df39946667dc572c7d.tar.bz2
Merge topic 'ctest-disable-tests'
b070947d Add 'DISABLED' test property 42c68aad CTest: Improve 'Completion Status' reported to CDash for 'Not Run' tests Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Merge-request: !571
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-properties.7.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 9967d00..072d7c5 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -325,6 +325,7 @@ Properties on Tests
/prop_test/ATTACHED_FILES
/prop_test/COST
/prop_test/DEPENDS
+ /prop_test/DISABLED
/prop_test/ENVIRONMENT
/prop_test/FAIL_REGULAR_EXPRESSION
/prop_test/FIXTURES_CLEANUP