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

10
Source/cmCTest.cxx
View File

@ -4095,7 +4095,6 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
else else
{ {
failed.push_back(m_TestCommand); failed.push_back(m_TestCommand);
}
std::string tryPath = m_TestCommand; std::string tryPath = m_TestCommand;
tryPath += cmSystemTools::GetExecutableExtension(); tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))
@ -4105,7 +4104,6 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
else else
{ {
failed.push_back(tryPath); failed.push_back(tryPath);
}
// try the Debug extension // try the Debug extension
tryPath = m_ConfigType + "/"; tryPath = m_ConfigType + "/";
tryPath += cmSystemTools::GetFilenameName(m_TestCommand); tryPath += cmSystemTools::GetFilenameName(m_TestCommand);
@ -4116,7 +4114,6 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
else else
{ {
failed.push_back(tryPath); failed.push_back(tryPath);
}
tryPath += cmSystemTools::GetExecutableExtension(); tryPath += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))
{ {
@ -4125,7 +4122,6 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
else else
{ {
failed.push_back(tryPath); failed.push_back(tryPath);
}
tryPath = m_ExecutableDirectory; tryPath = m_ExecutableDirectory;
tryPath += "/"; tryPath += "/";
tryPath += m_TestCommand; tryPath += m_TestCommand;
@ -4137,7 +4133,6 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
else else
{ {
failed.push_back(tryPath); failed.push_back(tryPath);
}
tryPath = m_ExecutableDirectory; tryPath = m_ExecutableDirectory;
tryPath += "/"; tryPath += "/";
tryPath += m_ConfigType + "/"; tryPath += m_ConfigType + "/";
@ -4151,6 +4146,11 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
{ {
failed.push_back(tryPath); failed.push_back(tryPath);
} }
}
}
}
}
}
if(!cmSystemTools::FileExists(fullPath.c_str())) if(!cmSystemTools::FileExists(fullPath.c_str()))
{ {
out << "Could not find path to executable, perhaps it was not built: " << out << "Could not find path to executable, perhaps it was not built: " <<

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 // return true if the file exists
bool SystemTools::FileExists(const char* filename) bool SystemTools::FileExists(const char* filename)
{ {
struct stat fs; // struct stat fs;
if (stat(filename, &fs) != 0) // if (stat(filename, &fs) != 0)
if ( access(filename, F_OK) != 0 )
{ {
return false; return false;
} }