diff options
author | Brad King <brad.king@kitware.com> | 2009-05-14 20:13:52 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-05-14 20:13:52 (GMT) |
commit | a524e07152728d652a29761b43b334b7aed390d6 (patch) | |
tree | deb1fd0082f7cad680d7686e30c21ec76a655ae5 /Modules | |
parent | ca3e9623e94f270e784dc621b1a38f455183882f (diff) | |
download | CMake-a524e07152728d652a29761b43b334b7aed390d6.zip CMake-a524e07152728d652a29761b43b334b7aed390d6.tar.gz CMake-a524e07152728d652a29761b43b334b7aed390d6.tar.bz2 |
ENH: Teach CTest to handle Bazaar repositories
This creates cmCTestBZR to drive CTest Update handling on bzr-based work
trees. Currently we always update to the head of the remote tracking
branch (bzr pull), so the nightly start time is ignored for Nightly
builds. A later change will address this. Patch from Tom Vercauteren.
See issue #6857.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/CTest.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index 44e8c67..342bbac 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -104,6 +104,7 @@ IF(BUILD_TESTING) SET(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING "Options passed to the cvs update command.") FIND_PROGRAM(SVNCOMMAND svn) + FIND_PROGRAM(BZRCOMMAND bzr) IF(NOT UPDATE_TYPE) IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS") @@ -111,6 +112,10 @@ IF(BUILD_TESTING) ELSE(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS") IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") SET(UPDATE_TYPE svn) + ELSE(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") + IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr") + SET(UPDATE_TYPE bzr) + ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr") ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS") ENDIF(NOT UPDATE_TYPE) @@ -130,6 +135,11 @@ IF(BUILD_TESTING) IF("${_update_type}" STREQUAL "svn") SET(UPDATE_COMMAND "${SVNCOMMAND}") SET(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}") + ELSE("${_update_type}" STREQUAL "svn") + IF("${_update_type}" STREQUAL "bzr") + SET(UPDATE_COMMAND "${BZRCOMMAND}") + SET(UPDATE_OPTIONS "${BZR_UPDATE_OPTIONS}") + ENDIF("${_update_type}" STREQUAL "bzr") ENDIF("${_update_type}" STREQUAL "svn") ENDIF("${_update_type}" STREQUAL "cvs") @@ -207,8 +217,10 @@ IF(BUILD_TESTING) COVERAGE_COMMAND CVSCOMMAND SVNCOMMAND + BZRCOMMAND CVS_UPDATE_OPTIONS SVN_UPDATE_OPTIONS + BZR_UPDATE_OPTIONS MAKECOMMAND MEMORYCHECK_COMMAND MEMORYCHECK_SUPPRESSIONS_FILE |