kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix timeout bug with global timeouts such as DART_TESTING_TIMEOUT

This commit is contained in:
Ken Martin 2007-06-08 14:16:04 -04:00
parent 546d7e72d9
commit d1c4a0bf9e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmCTest.cxx
View File

@ -1098,7 +1098,8 @@ int cmCTest::RunTest(std::vector<const char*> argv,
{ {
timeout = 1; timeout = 1;
} }
cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
"Test timeout computed to be: " << timeout << "\n");
if(cmSystemTools::SameFile(argv[0], this->CTestSelf.c_str()) && if(cmSystemTools::SameFile(argv[0], this->CTestSelf.c_str()) &&
!this->ForceNewCTestProcess) !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 // make sure we pass the timeout in for any build and test
// invocations. Since --build-generator is required this is a // invocations. Since --build-generator is required this is a
// good place to check for it, and to add the arguments in // 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"); args.push_back("--test-timeout");
cmOStringStream msg; cmOStringStream msg;