[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.91 1.92 CTestUpdateHG.cmake.in NONE 1.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Jul 10 11:08:13 EDT 2009
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv10297/Tests
Modified Files:
CMakeLists.txt
Added Files:
CTestUpdateHG.cmake.in
Log Message:
ENH: Teach CTest to handle Mercurial repositories
This creates cmCTestHG to drive CTest Update handling on hg-based work
trees. Currently we always update to the head of the remote tracking
branch (hg pull), so the nightly start time is ignored for Nightly
builds. A later change will address this.
See issue #7879. Patch from Emmanuel Christophe. I modified the patch
slightly for code style, to finish up some parsing details, and to fix
the test.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.91
retrieving revision 1.92
diff -C 2 -d -r1.91 -r1.92
*** CMakeLists.txt 1 Jul 2009 18:29:25 -0000 1.91
--- CMakeLists.txt 10 Jul 2009 15:08:02 -0000 1.92
***************
*** 977,980 ****
--- 977,998 ----
ENDIF(CTEST_TEST_UPDATE_GIT)
+ # Test CTest Update with HG
+ FIND_PROGRAM(HG_EXECUTABLE NAMES hg)
+ MARK_AS_ADVANCED(HG_EXECUTABLE)
+ SET(CTEST_TEST_UPDATE_HG 0)
+ IF(HG_EXECUTABLE)
+ IF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
+ SET(CTEST_TEST_UPDATE_HG 1)
+ ENDIF(NOT "${CVS_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
+ ENDIF(HG_EXECUTABLE)
+ IF(CTEST_TEST_UPDATE_HG)
+ SET(CTestUpdateHG_DIR "CTest UpdateHG")
+ CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateHG.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestUpdateHG.cmake" @ONLY)
+ ADD_TEST(CTest.UpdateHG ${CMAKE_CMAKE_COMMAND}
+ -P "${CMake_BINARY_DIR}/Tests/CTestUpdateHG.cmake"
+ )
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateHG_DIR}")
+ ENDIF(CTEST_TEST_UPDATE_HG)
ENDIF(CTEST_TEST_UPDATE)
--- NEW FILE: CTestUpdateHG.cmake.in ---
# This script drives creation of a Mercurial 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}/@CTestUpdateHG_DIR@")
# Include code common to all update tests.
include("@CMAKE_CURRENT_SOURCE_DIR@/CTestUpdateCommon.cmake")
#-----------------------------------------------------------------------------
# Report hg tools in use.
message("Using HG tools:")
set(HG "@HG_EXECUTABLE@")
message(" hg = ${HG}")
#-----------------------------------------------------------------------------
# Initialize the testing directory.
message("Creating test directory...")
init_testing()
#-----------------------------------------------------------------------------
# Create the repository.
message("Creating repository...")
file(MAKE_DIRECTORY ${TOP}/repo.hg)
run_child(
WORKING_DIRECTORY ${TOP}/repo.hg
COMMAND ${HG} init
)
set(REPO file://${TOP}/repo.hg)
#-----------------------------------------------------------------------------
# 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 ${HG} init
)
run_child(WORKING_DIRECTORY ${TOP}/import
COMMAND ${HG} add .
)
run_child(WORKING_DIRECTORY ${TOP}/import
COMMAND ${HG} commit -m "Initial content"
-u "Test Author <testauthor at cmake.org>"
)
run_child(WORKING_DIRECTORY ${TOP}/import
COMMAND ${HG} push "${REPO}"
)
#-----------------------------------------------------------------------------
# Create a working tree.
message("Checking out first revision...")
run_child(
WORKING_DIRECTORY ${TOP}
COMMAND ${HG} clone ${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 ${HG} add ${dirs_added}
)
endif(dirs_added)
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} add ${files_added}
)
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} rm ${files_removed}
)
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} add
)
#-----------------------------------------------------------------------------
# Commit the changes to the repository.
message("Committing revision 2...")
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} commit -m "Changed content"
-u "Test Author <testauthor at cmake.org>"
)
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} push
)
#-----------------------------------------------------------------------------
# Make changes in the working tree.
message("Changing content again...")
change_content(user-source)
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} add
)
#-----------------------------------------------------------------------------
# Commit the changes to the repository.
message("Committing revision 3...")
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} commit -m "Changed content again"
-u "Test Author <testauthor at cmake.org>"
)
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} push
)
#-----------------------------------------------------------------------------
# Go back to before the changes so we can test updating.
message("Backing up to first revision...")
run_child(
WORKING_DIRECTORY ${TOP}/user-source
COMMAND ${HG} update -C -r 0
)
# 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
"# HG command configuration
UpdateCommand: ${HG}
")
# 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
"# hg command configuration
set(CTEST_HG_COMMAND \"${HG}\")
set(CTEST_HG_UPDATE_OPTIONS)
execute_process(
WORKING_DIRECTORY \"${TOP}\"
COMMAND \"${HG}\" clone \"${REPO}\" dash-source
)
execute_process(
WORKING_DIRECTORY \"${TOP}/dash-source\"
COMMAND \"${HG}\" update -C -r 0
)
")
# Run the dashboard script with CTest.
run_dashboard_script(dashboard.cmake)
More information about the Cmake-commits
mailing list