diff options
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/ZeroOverridesFlag-stdout.txt | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index bfc6bd6..cd92e0a 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1379,7 +1379,7 @@ bool cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed, p.Cost = static_cast<float>(rand()); } - if (p.Timeout == cmDuration::zero() && + if (p.Timeout == cmDuration::zero() && !p.ExplicitTimeout && this->CTest->GetGlobalTimeout() != cmDuration::zero()) { p.Timeout = this->CTest->GetGlobalTimeout(); } diff --git a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake index e55ba27..a4080e3 100644 --- a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake @@ -8,7 +8,7 @@ endif() function(run_ctest_timeout CASE_NAME) configure_file(${RunCMake_SOURCE_DIR}/TestTimeout.c ${RunCMake_BINARY_DIR}/${CASE_NAME}/TestTimeout.c COPYONLY) - run_ctest(${CASE_NAME}) + run_ctest(${CASE_NAME} ${ARGN}) endfunction() run_ctest_timeout(Basic) @@ -27,6 +27,7 @@ block() # The test sleeps for 4 seconds longer than the TIMEOUT value. # Set a default timeout to less than that so that the test will # timeout if the zero TIMEOUT does not suppress it. + run_ctest_timeout(ZeroOverridesFlag --timeout 2) set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") run_ctest_timeout(ZeroOverridesVar) endblock() diff --git a/Tests/RunCMake/CTestTimeout/ZeroOverridesFlag-stdout.txt b/Tests/RunCMake/CTestTimeout/ZeroOverridesFlag-stdout.txt new file mode 100644 index 0000000..746bc21 --- /dev/null +++ b/Tests/RunCMake/CTestTimeout/ZeroOverridesFlag-stdout.txt @@ -0,0 +1,6 @@ +Test project [^ +]*/Tests/RunCMake/CTestTimeout/ZeroOverridesFlag-build + Start 1: TestTimeout +1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec ++ +100% tests passed, 0 tests failed out of 1 |