diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-10 13:05:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-10 13:05:45 (GMT) |
| commit | 163be8714a279aa16e4511d0059e9cd471f0a256 (patch) | |
| tree | 38e0925324141a953a549a1a10952f3f3c2a3ef6 /Tests | |
| parent | 38bb98de511e41ae48c6c5193cc0333d54033365 (diff) | |
| parent | 3b272ff8e424b4f3e32fbc541732fdb6798cd978 (diff) | |
| download | CMake-163be8714a279aa16e4511d0059e9cd471f0a256.zip CMake-163be8714a279aa16e4511d0059e9cd471f0a256.tar.gz CMake-163be8714a279aa16e4511d0059e9cd471f0a256.tar.bz2 | |
Merge topic 'update-ctest-documentation'
3b272ff8 Help: Add 'Label and Subproject Summary' section to ctest(1) manual
002d0a1c Help: Normalize capitalization of 'CTest' in ctest(1) manual
9d3aa95c Help: Divide ctest(1) manual options into sections
7904b659 Tests: Remove incorrect use of 'test-timeout' option
e80dc2ad cmCTest: Remove dead code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1427
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index e936dab..0fafea5 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -102,7 +102,7 @@ function(run_TestLoad name load) add_test(TestLoad1 \"${CMAKE_COMMAND}\" -E echo \"test of --test-load\") add_test(TestLoad2 \"${CMAKE_COMMAND}\" -E echo \"test of --test-load\") ") - run_cmake_command(${name} ${CMAKE_CTEST_COMMAND} -j2 --test-load ${load} --test-timeout 5) + run_cmake_command(${name} ${CMAKE_CTEST_COMMAND} -j2 --test-load ${load}) endfunction() # Tests for the --test-load feature of ctest |