When running the same ctest as the one we are testing, make sure to run as separate process
This commit is contained in:
parent
f7ddfbe1fd
commit
5e5d8d85e1
@ -1046,6 +1046,7 @@ cmLocalUnixMakefileGenerator3
|
|||||||
ctest += "ctest";
|
ctest += "ctest";
|
||||||
ctest += cmSystemTools::GetExecutableExtension();
|
ctest += cmSystemTools::GetExecutableExtension();
|
||||||
ctest = this->Convert(ctest.c_str(),START_OUTPUT,SHELL);
|
ctest = this->Convert(ctest.c_str(),START_OUTPUT,SHELL);
|
||||||
|
ctest += " --force-new-ctest-process";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -1061,9 +1062,8 @@ cmLocalUnixMakefileGenerator3
|
|||||||
std::vector<std::string> no_depends;
|
std::vector<std::string> no_depends;
|
||||||
std::vector<std::string> commands;
|
std::vector<std::string> commands;
|
||||||
this->AppendEcho(commands, "Running tests...");
|
this->AppendEcho(commands, "Running tests...");
|
||||||
std::string cmd = ctest;
|
ctest += " $(ARGS)";
|
||||||
cmd += " $(ARGS)";
|
commands.push_back(ctest);
|
||||||
commands.push_back(cmd);
|
|
||||||
this->WriteMakeRule(makefileStream,
|
this->WriteMakeRule(makefileStream,
|
||||||
"Special rule to drive testing with ctest.",
|
"Special rule to drive testing with ctest.",
|
||||||
"test", no_depends, commands);
|
"test", no_depends, commands);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user