[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.90 1.91

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv20567/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Skip CTest.Update* for cygwin tools on Windows

These tests cannot run with cygwin tools unless testing cygwin CTest.
The version control tools do not understand all Windows paths.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.90
retrieving revision 1.91
diff -C 2 -d -r1.90 -r1.91
*** CMakeLists.txt	25 Jun 2009 14:51:53 -0000	1.90
--- CMakeLists.txt	1 Jul 2009 18:29:25 -0000	1.91
***************
*** 929,933 ****
--- 929,939 ----
      FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
      MARK_AS_ADVANCED(BZR_EXECUTABLE)
+     SET(CTEST_TEST_UPDATE_BZR 0)
      IF(BZR_EXECUTABLE)
+       IF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
+         SET(CTEST_TEST_UPDATE_BZR 1)
+       ENDIF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
+     ENDIF(BZR_EXECUTABLE)
+     IF(CTEST_TEST_UPDATE_BZR)
        # Check if xmloutput plugin is there
        EXECUTE_PROCESS(COMMAND ${BZR_EXECUTABLE} xmlplugins RESULT_VARIABLE xmlplugres
***************
*** 950,959 ****
          LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateBZR_DIR}")
        ENDIF( NOT ${xmlplugres} )
!     ENDIF(BZR_EXECUTABLE)
  
      # Test CTest Update with GIT
      FIND_PROGRAM(GIT_EXECUTABLE NAMES git)
      MARK_AS_ADVANCED(GIT_EXECUTABLE)
      IF(GIT_EXECUTABLE)
        SET(CTestUpdateGIT_DIR "CTest UpdateGIT")
        CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateGIT.cmake.in"
--- 956,971 ----
          LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateBZR_DIR}")
        ENDIF( NOT ${xmlplugres} )
!     ENDIF(CTEST_TEST_UPDATE_BZR)
  
      # Test CTest Update with GIT
      FIND_PROGRAM(GIT_EXECUTABLE NAMES git)
      MARK_AS_ADVANCED(GIT_EXECUTABLE)
+     SET(CTEST_TEST_UPDATE_GIT 0)
      IF(GIT_EXECUTABLE)
+       IF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
+         SET(CTEST_TEST_UPDATE_GIT 1)
+       ENDIF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
+     ENDIF(GIT_EXECUTABLE)
+     IF(CTEST_TEST_UPDATE_GIT)
        SET(CTestUpdateGIT_DIR "CTest UpdateGIT")
        CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateGIT.cmake.in"
***************
*** 963,967 ****
          )
        LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}")
!     ENDIF(GIT_EXECUTABLE)
  
    ENDIF(CTEST_TEST_UPDATE)
--- 975,979 ----
          )
        LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}")
!     ENDIF(CTEST_TEST_UPDATE_GIT)
  
    ENDIF(CTEST_TEST_UPDATE)