[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestTestHandler.cxx 1.125 1.126

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv26676/Source/CTest

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
Change logic of ctest subdirs command to allow for absolute paths.  Also added test coverage for passing absolute paths to subdirs.


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.125
retrieving revision 1.126
diff -C 2 -d -r1.125 -r1.126
*** cmCTestTestHandler.cxx	9 Nov 2009 19:07:36 -0000	1.125
--- cmCTestTestHandler.cxx	10 Nov 2009 15:40:11 -0000	1.126
***************
*** 83,97 ****
      {
      cmSystemTools::ChangeDirectory(cwd.c_str());
!     std::string fname = cwd;
!     fname += "/";
!     fname += *it;
  
!     //sanity check on relative path; if not, try absolute path
!     if ( !cmSystemTools::FileIsDirectory(fname.c_str()))
        {
        fname = *it;
        }
  
!     if ( !cmSystemTools::FileExists(fname.c_str()) )
        {
        // No subdirectory? So what...
--- 83,100 ----
      {
      cmSystemTools::ChangeDirectory(cwd.c_str());
!     std::string fname;
  
!     if(cmSystemTools::FileIsFullPath(it->c_str()))
        {
        fname = *it;
        }
+     else
+       {
+       fname = cwd;
+       fname += "/";
+       fname += *it;
+       }
  
!     if ( !cmSystemTools::FileIsDirectory(fname.c_str()) )
        {
        // No subdirectory? So what...