diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-09-18 15:34:53 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-09-18 15:34:53 (GMT) |
| commit | cc1f1014e303522fb6b860c0a4343a06c32ad5cb (patch) | |
| tree | 3a7cc5aec246813718524ea32e3f161ad413e37c /Source/cmCTest.cxx | |
| parent | 4cb2240576d2b9ccd520d3cb81bd49a57b60fa4d (diff) | |
| download | CMake-cc1f1014e303522fb6b860c0a4343a06c32ad5cb.zip CMake-cc1f1014e303522fb6b860c0a4343a06c32ad5cb.tar.gz CMake-cc1f1014e303522fb6b860c0a4343a06c32ad5cb.tar.bz2 | |
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
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 8158257..6c1d3bd 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -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) { |