mirror of
https://github.com/reactos/CMake.git
synced 2024-11-28 05:50:42 +00:00
ENH: allow test properties to set a timeout that is longer than the default timeout, but not longer than CTEST_TIME_LIMIT for a script
This commit is contained in:
parent
4cb2240576
commit
cc1f1014e3
@ -1095,10 +1095,12 @@ int cmCTest::RunTest(std::vector<const char*> argv,
|
||||
{
|
||||
timeout = this->TimeOut;
|
||||
}
|
||||
if (testTimeOut && testTimeOut < timeout)
|
||||
if (testTimeOut
|
||||
&& testTimeOut < this->GetRemainingTimeAllowed())
|
||||
{
|
||||
timeout = testTimeOut;
|
||||
}
|
||||
|
||||
// always have at least 1 second if we got to here
|
||||
if (timeout <= 0)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user