[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.68.2.1 1.68.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmCTestTestHandler.cxx 
Log Message:
ENH: merge in changes from head


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.68.2.1
retrieving revision 1.68.2.2
diff -C 2 -d -r1.68.2.1 -r1.68.2.2
*** cmCTestTestHandler.cxx	23 May 2008 20:09:40 -0000	1.68.2.1
--- cmCTestTestHandler.cxx	13 Jun 2008 12:55:18 -0000	1.68.2.2
***************
*** 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;