Merge branch 'fix_timeout_docs' into release

This commit is contained in:
Brad King 2015-02-10 12:59:32 -05:00
commit 0a95c5ce2e
1 changed files with 1 additions and 1 deletions

View File

@ -6,4 +6,4 @@ How many seconds to allow for this test.
This property if set will limit a test to not take more than the
specified number of seconds to run. If it exceeds that the test
process will be killed and ctest will move to the next test. This
setting takes precedence over CTEST_TESTING_TIMEOUT.
setting takes precedence over :variable:`CTEST_TEST_TIMEOUT`.