[Cmake-commits] [cmake-commits] king committed cmCTestBuildAndTestHandler.cxx 1.21 1.22

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestBuildAndTestHandler.cxx 
Log Message:
BUG: Make CTest honor user-specified config

When the -C or --build-config option is used to specify the
configuration to be tested by CTest, do not override it with the
configuration in which CTest is built.


Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** cmCTestBuildAndTestHandler.cxx	18 Jun 2008 13:07:53 -0000	1.21
--- cmCTestBuildAndTestHandler.cxx	4 Sep 2008 15:31:10 -0000	1.22
***************
*** 80,84 ****
      }
  #ifdef CMAKE_INTDIR
!   config = CMAKE_INTDIR;
  #endif
    
--- 80,87 ----
      }
  #ifdef CMAKE_INTDIR
!   if(!config)
!     {
!     config = CMAKE_INTDIR;
!     }
  #endif
    
***************
*** 260,264 ****
        }
  #ifdef CMAKE_INTDIR
!     config = CMAKE_INTDIR;
  #endif
      if(!config)
--- 263,270 ----
        }
  #ifdef CMAKE_INTDIR
!     if(!config)
!       {
!       config = CMAKE_INTDIR;
!       }
  #endif
      if(!config)