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

ENH: Only look for executable until found

Browse Source
This commit is contained in:
Andy Cedilnik 2004-01-12 13:30:57 -05:00
parent 002679fdba
commit b4bf41434c
2 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
Source/cmCTest.cxx
View File

@ -4095,61 +4095,61 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
else
{
failed.push_back(m_TestCommand);
}
std::string tryPath = m_TestCommand;
tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
}
// try the Debug extension
tryPath = m_ConfigType + "/";
tryPath += cmSystemTools::GetFilenameName(m_TestCommand);
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
}
tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
}
tryPath = m_ExecutableDirectory;
tryPath += "/";
tryPath += m_TestCommand;
tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
}
tryPath = m_ExecutableDirectory;
tryPath += "/";
tryPath += m_ConfigType + "/";
tryPath += m_TestCommand;
tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
std::string tryPath = m_TestCommand;
tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
// try the Debug extension
tryPath = m_ConfigType + "/";
tryPath += cmSystemTools::GetFilenameName(m_TestCommand);
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
tryPath = m_ExecutableDirectory;
tryPath += "/";
tryPath += m_TestCommand;
tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
tryPath = m_ExecutableDirectory;
tryPath += "/";
tryPath += m_ConfigType + "/";
tryPath += m_TestCommand;
tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
}
else
{
failed.push_back(tryPath);
}
}
}
}
}
}
if(!cmSystemTools::FileExists(fullPath.c_str()))
{

5
Source/kwsys/SystemTools.cxx
View File

@ -626,8 +626,9 @@ bool SystemTools::SameFile(const char* file1, const char* file2)
// return true if the file exists
bool SystemTools::FileExists(const char* filename)
{
struct stat fs;
if (stat(filename, &fs) != 0)
// struct stat fs;
// if (stat(filename, &fs) != 0)
if ( access(filename, F_OK) != 0 )
{
return false;
}