summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-22 12:09:55 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-22 12:09:55 (GMT)
commitf4475eb92beade22fca16f21b40df19b48c6559b (patch)
tree58ef2d59485fa84c63ad8a24d4674d848858f055 /Help/manual
parent3e14e594b41fe66d0366eadd5691c9a53e7e13c9 (diff)
parent73f47c9e46d42513cd7eeb08e27c4d1a424949ad (diff)
downloadCMake-f4475eb92beade22fca16f21b40df19b48c6559b.zip
CMake-f4475eb92beade22fca16f21b40df19b48c6559b.tar.gz
CMake-f4475eb92beade22fca16f21b40df19b48c6559b.tar.bz2
Merge topic 'test-fixtures'
73f47c9e CTest: Add support for test fixtures
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-properties.7.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 2cb6a1a..271f497 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -304,6 +304,9 @@ Properties on Tests
/prop_test/DEPENDS
/prop_test/ENVIRONMENT
/prop_test/FAIL_REGULAR_EXPRESSION
+ /prop_test/FIXTURES_CLEANUP
+ /prop_test/FIXTURES_REQUIRED
+ /prop_test/FIXTURES_SETUP
/prop_test/LABELS
/prop_test/MEASUREMENT
/prop_test/PASS_REGULAR_EXPRESSION