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

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Nov 9 14:07:38 EST 2009


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

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
Bug 9090: CTest does not handle absolute paths in CTestTestfile SUBDIR( ) entries.

The ctest subdirs command now checks the relative path first, and if that does not exist, also checks if the given path was absolute.  Thanks vodall for the patch.


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.124
retrieving revision 1.125
diff -C 2 -d -r1.124 -r1.125
*** cmCTestTestHandler.cxx	29 Oct 2009 19:30:12 -0000	1.124
--- cmCTestTestHandler.cxx	9 Nov 2009 19:07:36 -0000	1.125
***************
*** 87,90 ****
--- 87,96 ----
      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()) )
        {



More information about the Cmake-commits mailing list