kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for network paths

This commit is contained in:
Andy Cedilnik 2002-11-21 12:26:31 -05:00
parent 209d00ccfc
commit 146a3de46d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/ctest.cxx
View File

@ -339,7 +339,8 @@ std::string ctest::FindExecutable(const char *exe)
cmSystemTools::SplitProgramPath(exe, dir, file); cmSystemTools::SplitProgramPath(exe, dir, file);
if(m_ConfigType != "") if(m_ConfigType != "")
{ {
if(TryExecutable(dir.c_str(), file.c_str(), &fullPath, m_ConfigType.c_str())) if(TryExecutable(dir.c_str(), file.c_str(), &fullPath,
m_ConfigType.c_str()))
{ {
return fullPath; return fullPath;
} }
@ -366,7 +367,7 @@ std::string ctest::FindExecutable(const char *exe)
return fullPath; return fullPath;
} }
if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Debug")) if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Debug"))
{ {
return fullPath; return fullPath;
} }
@ -792,8 +793,9 @@ void ctest::ProcessDirectory(std::vector<std::string> &passed,
fflush(stderr); fflush(stderr);
//std::cerr << "Testing " << args[0] << " ... "; //std::cerr << "Testing " << args[0] << " ... ";
// find the test executable // find the test executable
std::string testCommand = std::string testCommand = this->FindExecutable(args[1].c_str());
cmSystemTools::EscapeSpaces(this->FindExecutable(args[1].c_str()).c_str()); testCommand = cmSystemTools::ConvertToOutputPath(testCommand.c_str());
// continue if we did not find the executable // continue if we did not find the executable
if (testCommand == "") if (testCommand == "")
{ {
@ -802,7 +804,6 @@ void ctest::ProcessDirectory(std::vector<std::string> &passed,
continue; continue;
} }
testCommand = cmSystemTools::ConvertToOutputPath(testCommand.c_str());
// add the arguments // add the arguments
std::vector<std::string>::iterator j = args.begin(); std::vector<std::string>::iterator j = args.begin();
++j; ++j;