[Cmake-commits] [cmake-commits] martink committed cmCTestTestHandler.cxx 1.69 1.70
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri May 30 09:14:34 EDT 2008
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv31780/Source/CTest
Modified Files:
cmCTestTestHandler.cxx
Log Message:
ENH: make tes test finding logic also try full paths as relative paths because some folks have been doing that and 2.4 handled it
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.69
retrieving revision 1.70
diff -C 2 -d -r1.69 -r1.70
*** cmCTestTestHandler.cxx 23 May 2008 15:28:46 -0000 1.69
--- cmCTestTestHandler.cxx 30 May 2008 13:14:25 -0000 1.70
***************
*** 1166,1170 ****
}
! // add additional configuraitons to the search path
void cmCTestTestHandler
::AddConfigurations(cmCTest *ctest,
--- 1166,1170 ----
}
! // add additional configurations to the search path
void cmCTestTestHandler
::AddConfigurations(cmCTest *ctest,
***************
*** 1176,1180 ****
std::string tempPath;
! if (filepath.size())
{
filepath += "/";
--- 1176,1181 ----
std::string tempPath;
! if (filepath.size() &&
! filepath[filepath.size()-1] != '/')
{
filepath += "/";
***************
*** 1260,1263 ****
--- 1261,1274 ----
filepath,filename);
+ // even if a fullpath was specified also try it relative to the current directory
+ if (filepath.size() && filepath[0] == '/')
+ {
+ std::string localfilepath = filepath.substr(1,filepath.size()-1);
+ cmCTestTestHandler::AddConfigurations(ctest, attempted,
+ attemptedConfigs,
+ localfilepath,filename);
+ }
+
+
// if extraPaths are provided and we were not passed a full path, try them,
// try any extra paths
***************
*** 1275,1280 ****
filenameExtra);
}
! }
!
// store the final location in fullPath
std::string fullPath;
--- 1286,1291 ----
filenameExtra);
}
! }
!
// store the final location in fullPath
std::string fullPath;
More information about the Cmake-commits
mailing list