diff options
| author | Ken Martin <ken.martin@kitware.com> | 2007-06-08 18:16:04 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2007-06-08 18:16:04 (GMT) |
| commit | d1c4a0bf9ee0851a576aea6af72b20222144f830 (patch) | |
| tree | 35cf9965ce8f0637b04e0c5a8387378b921acdfd /Source/cmCTest.cxx | |
| parent | 546d7e72d9c6bfd851d96dbc77ce98dc19955cd9 (diff) | |
| download | CMake-d1c4a0bf9ee0851a576aea6af72b20222144f830.zip CMake-d1c4a0bf9ee0851a576aea6af72b20222144f830.tar.gz CMake-d1c4a0bf9ee0851a576aea6af72b20222144f830.tar.bz2 | |
BUG: fix timeout bug with global timeouts such as DART_TESTING_TIMEOUT
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 149fb84..b650001 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1098,7 +1098,8 @@ int cmCTest::RunTest(std::vector<const char*> argv, { timeout = 1; } - + cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, + "Test timeout computed to be: " << timeout << "\n"); if(cmSystemTools::SameFile(argv[0], this->CTestSelf.c_str()) && !this->ForceNewCTestProcess) { @@ -1113,7 +1114,7 @@ int cmCTest::RunTest(std::vector<const char*> argv, // make sure we pass the timeout in for any build and test // invocations. Since --build-generator is required this is a // good place to check for it, and to add the arguments in - if (strcmp(argv[i],"--build-generator") == 0 && testTimeOut) + if (strcmp(argv[i],"--build-generator") == 0 && timeout) { args.push_back("--test-timeout"); cmOStringStream msg; |