BUG: fix in the timeout code
This commit is contained in:
parent
2b54ecd1e4
commit
098c1dcdfe
|
@ -1136,8 +1136,6 @@ int cmCTest::RunTest(std::vector<const char*> argv,
|
||||||
{
|
{
|
||||||
timeout = this->TimeOut;
|
timeout = this->TimeOut;
|
||||||
}
|
}
|
||||||
cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "-- timeout set to "
|
|
||||||
<< testTimeOut << std::endl);
|
|
||||||
if (testTimeOut && testTimeOut < timeout)
|
if (testTimeOut && testTimeOut < timeout)
|
||||||
{
|
{
|
||||||
timeout = testTimeOut;
|
timeout = testTimeOut;
|
||||||
|
@ -1148,7 +1146,7 @@ int cmCTest::RunTest(std::vector<const char*> argv,
|
||||||
timeout = 1;
|
timeout = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
cmsysProcess_SetTimeout(cp, this->TimeOut);
|
cmsysProcess_SetTimeout(cp, timeout);
|
||||||
cmsysProcess_Execute(cp);
|
cmsysProcess_Execute(cp);
|
||||||
|
|
||||||
char* data;
|
char* data;
|
||||||
|
|
Loading…
Reference in New Issue