kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2009-07-01 14:29:25 -04:00
parent 44878e7b11
commit 4fc192c6cf
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tests/CMakeLists.txt
View File

@ -928,7 +928,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
# Test CTest Update with BZR
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
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)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateBZR_DIR}")
ENDIF( NOT ${xmlplugres} )
ENDIF(BZR_EXECUTABLE)
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"
"${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"
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}")
ENDIF(GIT_EXECUTABLE)
ENDIF(CTEST_TEST_UPDATE_GIT)
ENDIF(CTEST_TEST_UPDATE)