[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.85 1.86 CTestUpdateBZR.cmake.in NONE 1.1

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Added Files:
	CTestUpdateBZR.cmake.in 
Log Message:
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.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.85
retrieving revision 1.86
diff -C 2 -d -r1.85 -r1.86
*** CMakeLists.txt	22 Apr 2009 13:19:05 -0000	1.85
--- CMakeLists.txt	14 May 2009 20:13:52 -0000	1.86
***************
*** 926,929 ****
--- 926,947 ----
      ENDIF(CTEST_TEST_UPDATE_CVS AND CVS_FOUND)
  
+     # Test CTest Update with BZR
+     FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
+     MARK_AS_ADVANCED(BZR_EXECUTABLE)
+     IF(BZR_EXECUTABLE)
+       # Check if xmloutput plugin is there
+       EXECUTE_PROCESS(COMMAND ${BZR_EXECUTABLE} xmlplugins RESULT_VARIABLE xmlplugres
+         OUTPUT_QUIET ERROR_QUIET)
+       IF( NOT ${xmlplugres} )
+         SET(CTestUpdateBZR_DIR "CTest UpdateBZR")
+         CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateBZR.cmake.in"
+           "${CMake_BINARY_DIR}/Tests/CTestUpdateBZR.cmake" @ONLY)
+         ADD_TEST(CTest.UpdateBZR ${CMAKE_CMAKE_COMMAND}
+           -P "${CMake_BINARY_DIR}/Tests/CTestUpdateBZR.cmake"
+           )
+         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)

--- NEW FILE: CTestUpdateBZR.cmake.in ---
# This script drives creation of a bzr repository and checks
# that CTest can update from it.

#-----------------------------------------------------------------------------
# Test in a directory next to this script.
get_filename_component(TOP "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(TOP "${TOP}/@CTestUpdateBZR_DIR@")

# Include code common to all update tests.
include("@CMAKE_CURRENT_SOURCE_DIR@/CTestUpdateCommon.cmake")

#-----------------------------------------------------------------------------
# Report bzr tools in use.
message("Using BZR tools:")
set(BZR "@BZR_EXECUTABLE@")
message(" bzr = ${BZR}")

#-----------------------------------------------------------------------------
# Initialize the testing directory.
message("Creating test directory...")
init_testing()

#-----------------------------------------------------------------------------
# Create the repository.
message("Creating repository...")
file(MAKE_DIRECTORY ${TOP}/repo.bzr)
run_child(
  WORKING_DIRECTORY ${TOP}/repo.bzr
  COMMAND ${BZR} init
  )
set(REPO file://${TOP}/repo.bzr)

#-----------------------------------------------------------------------------
# Import initial content into the repository.
message("Importing content...")
create_content(import)

# Import the content into the repository.
run_child(WORKING_DIRECTORY ${TOP}/import
  COMMAND ${BZR} init
  )

run_child(WORKING_DIRECTORY ${TOP}/import
  COMMAND ${BZR} add .
  )
run_child(WORKING_DIRECTORY ${TOP}/import
  COMMAND ${BZR} commit -m "Initial content"
  )
run_child(WORKING_DIRECTORY ${TOP}/import
  COMMAND ${BZR} push --create-prefix "${REPO}"
  )

#-----------------------------------------------------------------------------
# Create a working tree.
message("Checking out revision 1...")
run_child(
  WORKING_DIRECTORY ${TOP}
  COMMAND ${BZR} branch "${REPO}" user-source
  )

#-----------------------------------------------------------------------------
# Make changes in the working tree.
message("Changing content...")
update_content(user-source files_added files_removed dirs_added)
if(dirs_added)
  run_child(
    WORKING_DIRECTORY ${TOP}/user-source
    COMMAND ${BZR} add ${dirs_added}
    )
endif(dirs_added)
run_child(
  WORKING_DIRECTORY ${TOP}/user-source
  COMMAND ${BZR} add ${files_added}
  )
run_child(
  WORKING_DIRECTORY ${TOP}/user-source
  COMMAND ${BZR} rm ${files_removed}
  )

#-----------------------------------------------------------------------------
# Commit the changes to the repository.
message("Committing revision 2...")
run_child(
  WORKING_DIRECTORY ${TOP}/user-source
  COMMAND ${BZR} commit -m "Changed content"
  )
run_child(
  WORKING_DIRECTORY ${TOP}/user-source
  COMMAND ${BZR} push "${REPO}"
  )

#-----------------------------------------------------------------------------
# Make changes in the working tree.
message("Changing content again...")
change_content(user-source)

#-----------------------------------------------------------------------------
# Commit the changes to the repository.
message("Committing revision 3...")
run_child(
  WORKING_DIRECTORY ${TOP}/user-source
  COMMAND ${BZR} commit -m "Changed content again"
  )
run_child(
  WORKING_DIRECTORY ${TOP}/user-source
  COMMAND ${BZR} push "${REPO}"
  )

#-----------------------------------------------------------------------------
# Go back to before the changes so we can test updating.
message("Backing up to revision 1...")
run_child(
  WORKING_DIRECTORY ${TOP}/user-source
  COMMAND ${BZR} pull --overwrite -r1
  )

# Create a modified file.
modify_content(user-source)

#-----------------------------------------------------------------------------
# Test updating the user work directory with the command-line interface.
message("Running CTest Dashboard Command Line...")

# Create the user build tree.
create_build_tree(user-source user-binary)
file(APPEND ${TOP}/user-binary/CTestConfiguration.ini
  "# BZR command configuration
UpdateCommand: ${BZR}
")

# Run the dashboard command line interface.
run_dashboard_command_line(user-binary)

#-----------------------------------------------------------------------------
# Test initial checkout and update with a dashboard script.
message("Running CTest Dashboard Script...")

create_dashboard_script(dashboard.cmake
  "# bzr command configuration
set(CTEST_BZR_COMMAND \"${BZR}\")
set(CTEST_CHECKOUT_COMMAND
  \"\\\"\${CTEST_BZR_COMMAND}\\\" branch -r1 \\\"${REPO}\\\" dash-source\")
")

# Run the dashboard script with CTest.
run_dashboard_script(dashboard.cmake)