Merge topic 'CTest-less-cd'
9969bfb CTest: avoid useless changing of directory
This commit is contained in:
commit
a052a79949
@ -82,7 +82,6 @@ bool cmCTestSubdirCommand
|
|||||||
std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
|
std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
|
||||||
for ( it = args.begin(); it != args.end(); ++ it )
|
for ( it = args.begin(); it != args.end(); ++ it )
|
||||||
{
|
{
|
||||||
cmSystemTools::ChangeDirectory(cwd.c_str());
|
|
||||||
std::string fname;
|
std::string fname;
|
||||||
|
|
||||||
if(cmSystemTools::FileIsFullPath(it->c_str()))
|
if(cmSystemTools::FileIsFullPath(it->c_str()))
|
||||||
@ -116,7 +115,6 @@ bool cmCTestSubdirCommand
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// No CTestTestfile? Who cares...
|
// No CTestTestfile? Who cares...
|
||||||
cmSystemTools::ChangeDirectory(cwd.c_str());
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
fname += "/";
|
fname += "/";
|
||||||
@ -133,6 +131,7 @@ bool cmCTestSubdirCommand
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
cmSystemTools::ChangeDirectory(cwd.c_str());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user