BUG: fix in the timeout code

This commit is contained in:
Ken Martin 2007-01-29 12:42:33 -05:00
parent 2b54ecd1e4
commit 098c1dcdfe

View File

@ -1136,8 +1136,6 @@ int cmCTest::RunTest(std::vector<const char*> argv,
{
timeout = this->TimeOut;
}
cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "-- timeout set to "
<< testTimeOut << std::endl);
if (testTimeOut && testTimeOut < timeout)
{
timeout = testTimeOut;
@ -1148,7 +1146,7 @@ int cmCTest::RunTest(std::vector<const char*> argv,
timeout = 1;
}
cmsysProcess_SetTimeout(cp, this->TimeOut);
cmsysProcess_SetTimeout(cp, timeout);
cmsysProcess_Execute(cp);
char* data;