Added the --timeout option to ctest command line. This sets a global timeout on all tests if no more specific timeout is set on them.
This commit is contained in:
parent
b21f1eaeae
commit
a52c0118d4
|
@ -1052,6 +1052,11 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
|
|||
p.Cost = rand();
|
||||
}
|
||||
|
||||
if(p.Timeout == 0 && this->CTest->GetGlobalTimeout() != 0)
|
||||
{
|
||||
p.Timeout = this->CTest->GetGlobalTimeout();
|
||||
}
|
||||
|
||||
if(p.Depends.size())
|
||||
{
|
||||
for(std::vector<std::string>::iterator i = p.Depends.begin();
|
||||
|
|
|
@ -224,6 +224,7 @@ cmCTest::cmCTest()
|
|||
this->MaxTestNameWidth = 30;
|
||||
this->InteractiveDebugMode = true;
|
||||
this->TimeOut = 0;
|
||||
this->GlobalTimeout = 0;
|
||||
this->CompressXMLFiles = false;
|
||||
this->CTestConfigFile = "";
|
||||
this->ScheduleType = "";
|
||||
|
@ -1703,6 +1704,13 @@ void cmCTest::HandleCommandLineArguments(size_t &i,
|
|||
this->SetParallelLevel(plevel);
|
||||
}
|
||||
|
||||
if(this->CheckArgument(arg, "--timeout") && i < args.size() - 1)
|
||||
{
|
||||
i++;
|
||||
double timeout = (double)atof(args[i].c_str());
|
||||
this->GlobalTimeout = timeout;
|
||||
}
|
||||
|
||||
if(this->CheckArgument(arg, "-C", "--build-config") &&
|
||||
i < args.size() - 1)
|
||||
{
|
||||
|
@ -2760,4 +2768,3 @@ void cmCTest::OutputTestErrors(std::vector<char> const &process_output)
|
|||
}
|
||||
cmCTestLog(this, HANDLER_OUTPUT, test_outputs << std::endl << std::flush);
|
||||
}
|
||||
|
||||
|
|
|
@ -129,6 +129,9 @@ public:
|
|||
std::string const& GetConfigType();
|
||||
double GetTimeOut() { return this->TimeOut; }
|
||||
void SetTimeOut(double t) { this->TimeOut = t; }
|
||||
|
||||
double GetGlobalTimeout() { return this->GlobalTimeout; }
|
||||
|
||||
// how many test to run at the same time
|
||||
int GetParallelLevel() { return this->ParallelLevel; }
|
||||
void SetParallelLevel(int);
|
||||
|
@ -419,6 +422,8 @@ private:
|
|||
|
||||
double TimeOut;
|
||||
|
||||
double GlobalTimeout;
|
||||
|
||||
int MaxTestNameWidth;
|
||||
|
||||
int ParallelLevel;
|
||||
|
|
Loading…
Reference in New Issue