Explorar el Código

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.
Brad King hace 16 años
padre
commit
4fc192c6cf
Se han modificado 1 ficheros con 14 adiciones y 2 borrados
  1. 14 2
      Tests/CMakeLists.txt

+ 14 - 2
Tests/CMakeLists.txt

@@ -928,7 +928,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
     # Test CTest Update with BZR
     # Test CTest Update with BZR
     FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
     FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
     MARK_AS_ADVANCED(BZR_EXECUTABLE)
     MARK_AS_ADVANCED(BZR_EXECUTABLE)
+    SET(CTEST_TEST_UPDATE_BZR 0)
     IF(BZR_EXECUTABLE)
     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
       # Check if xmloutput plugin is there
       EXECUTE_PROCESS(COMMAND ${BZR_EXECUTABLE} xmlplugins RESULT_VARIABLE xmlplugres
       EXECUTE_PROCESS(COMMAND ${BZR_EXECUTABLE} xmlplugins RESULT_VARIABLE xmlplugres
         OUTPUT_QUIET ERROR_QUIET)
         OUTPUT_QUIET ERROR_QUIET)
@@ -949,12 +955,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
         SET_TESTS_PROPERTIES(CTest.UpdateBZR.CLocale PROPERTIES ENVIRONMENT LC_ALL=C)
         SET_TESTS_PROPERTIES(CTest.UpdateBZR.CLocale PROPERTIES ENVIRONMENT LC_ALL=C)
         LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateBZR_DIR}")
         LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateBZR_DIR}")
       ENDIF( NOT ${xmlplugres} )
       ENDIF( NOT ${xmlplugres} )
-    ENDIF(BZR_EXECUTABLE)
+    ENDIF(CTEST_TEST_UPDATE_BZR)
 
 
     # Test CTest Update with GIT
     # Test CTest Update with GIT
     FIND_PROGRAM(GIT_EXECUTABLE NAMES git)
     FIND_PROGRAM(GIT_EXECUTABLE NAMES git)
     MARK_AS_ADVANCED(GIT_EXECUTABLE)
     MARK_AS_ADVANCED(GIT_EXECUTABLE)
+    SET(CTEST_TEST_UPDATE_GIT 0)
     IF(GIT_EXECUTABLE)
     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")
       SET(CTestUpdateGIT_DIR "CTest UpdateGIT")
       CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateGIT.cmake.in"
       CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateGIT.cmake.in"
         "${CMake_BINARY_DIR}/Tests/CTestUpdateGIT.cmake" @ONLY)
         "${CMake_BINARY_DIR}/Tests/CTestUpdateGIT.cmake" @ONLY)
@@ -962,7 +974,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
         -P "${CMake_BINARY_DIR}/Tests/CTestUpdateGIT.cmake"
         -P "${CMake_BINARY_DIR}/Tests/CTestUpdateGIT.cmake"
         )
         )
       LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}")
       LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}")
-    ENDIF(GIT_EXECUTABLE)
+    ENDIF(CTEST_TEST_UPDATE_GIT)
 
 
   ENDIF(CTEST_TEST_UPDATE)
   ENDIF(CTEST_TEST_UPDATE)