diff options
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | Tests/CTestUpdateBZR.cmake.in | 4 | ||||
| -rw-r--r-- | Tests/CTestUpdateCVS.cmake.in | 4 | ||||
| -rw-r--r-- | Tests/CTestUpdateCommon.cmake | 18 | ||||
| -rw-r--r-- | Tests/CTestUpdateGIT.cmake.in | 59 | ||||
| -rwxr-xr-x | Tests/CTestUpdateGIT.sh.in | 2 | ||||
| -rw-r--r-- | Tests/CTestUpdateHG.cmake.in | 4 | ||||
| -rw-r--r-- | Tests/CTestUpdateSVN.cmake.in | 4 | ||||
| -rw-r--r-- | Tests/bootstrap.bat.in | 2 |
9 files changed, 84 insertions, 33 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 0aaa7fb..2c7056d 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1076,7 +1076,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ # Make sure CTest can handle a test with no newline in output. ADD_TEST(CTest.NoNewline - ${CMAKE_COMMAND} -E echo_append "This line has no newline!") + ${CMAKE_CMAKE_COMMAND} -E echo_append "This line has no newline!") # A simple test for ctest in script mode CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestScriptMode/CTestTestScriptMode.cmake.in" @@ -1559,16 +1559,24 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ # If there is CMakeLists.txt in the binary tree, assume in-source build SET(CMAKE_SKIP_BOOTSTRAP_TEST 1) ENDIF(EXISTS "${CMAKE_BINARY_DIR}/CMakeLists.txt") - IF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST) - - + SET(bootstrap "") + IF(CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST) + IF(UNIX) + SET(bootstrap ${CMake_SOURCE_DIR}/bootstrap) + ELSEIF(MSYS) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bootstrap.bat.in + ${CMAKE_CURRENT_BINARY_DIR}/bootstrap.bat @ONLY) + SET(bootstrap ${CMAKE_CURRENT_BINARY_DIR}/bootstrap.bat) + ENDIF() + ENDIF() + IF(bootstrap) ADD_TEST(BootstrapTest ${CMAKE_CTEST_COMMAND} --build-and-test ${CMake_SOURCE_DIR} ${CMake_BINARY_DIR}/Tests/BootstrapTest --build-nocmake --build-noclean - --build-makeprogram ${CMake_SOURCE_DIR}/bootstrap + --build-makeprogram ${bootstrap} --build-generator "${CMAKE_TEST_GENERATOR}" --test-command ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake) @@ -1582,7 +1590,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ SET_TESTS_PROPERTIES ( BootstrapTest PROPERTIES TIMEOUT 5400) ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND) - ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST) + ENDIF() # fortran does not work for IDE builds because # CMAKE_STANDARD_LIBRARIES needs to be per language diff --git a/Tests/CTestUpdateBZR.cmake.in b/Tests/CTestUpdateBZR.cmake.in index 7f90b50..c654f47 100644 --- a/Tests/CTestUpdateBZR.cmake.in +++ b/Tests/CTestUpdateBZR.cmake.in @@ -142,7 +142,7 @@ 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 +create_dashboard_script(dash-binary "# bzr command configuration set(CTEST_BZR_COMMAND \"${BZR}\") set(CTEST_CHECKOUT_COMMAND @@ -150,4 +150,4 @@ set(CTEST_CHECKOUT_COMMAND ") # Run the dashboard script with CTest. -run_dashboard_script(dashboard.cmake) +run_dashboard_script(dash-binary) diff --git a/Tests/CTestUpdateCVS.cmake.in b/Tests/CTestUpdateCVS.cmake.in index 6f31a2c..a04673e 100644 --- a/Tests/CTestUpdateCVS.cmake.in +++ b/Tests/CTestUpdateCVS.cmake.in @@ -147,7 +147,7 @@ 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 +create_dashboard_script(dash-binary "# CVS command configuration set(CTEST_CVS_COMMAND \"${CVS}\") set(CTEST_CVS_UPDATE_OPTIONS -dAP) @@ -156,4 +156,4 @@ set(CTEST_CHECKOUT_COMMAND ") # Run the dashboard script with CTest. -run_dashboard_script(dashboard.cmake) +run_dashboard_script(dash-binary) diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake index 266f4b3..a52cb14 100644 --- a/Tests/CTestUpdateCommon.cmake +++ b/Tests/CTestUpdateCommon.cmake @@ -165,15 +165,15 @@ endfunction(create_build_tree) #----------------------------------------------------------------------------- # Function to write the dashboard test script. -function(create_dashboard_script name custom_text) +function(create_dashboard_script bin_dir custom_text) # Write the dashboard script. - file(WRITE ${TOP}/dashboard.cmake + file(WRITE ${TOP}/${bin_dir}.cmake "# CTest Dashboard Script set(CTEST_DASHBOARD_ROOT \"${TOP}\") set(CTEST_SITE test.site) set(CTEST_BUILD_NAME dash-test) set(CTEST_SOURCE_DIRECTORY \${CTEST_DASHBOARD_ROOT}/dash-source) -set(CTEST_BINARY_DIRECTORY \${CTEST_DASHBOARD_ROOT}/dash-binary) +set(CTEST_BINARY_DIRECTORY \${CTEST_DASHBOARD_ROOT}/${bin_dir}) ${custom_text} # Start a dashboard and run the update step ctest_start(Experimental) @@ -191,27 +191,31 @@ function(run_dashboard_command_line bin_dir) # Verify the updates reported by CTest. list(APPEND UPDATE_MAYBE Updated{subdir}) + set(_modified Modified{CTestConfig.cmake}) + if(UPDATE_NO_MODIFIED) + set(_modified "") + endif() check_updates(${bin_dir} Updated{foo.txt} Updated{bar.txt} Updated{zot.txt} Updated{subdir/foo.txt} Updated{subdir/bar.txt} - Modified{CTestConfig.cmake} + ${_modified} ) endfunction(run_dashboard_command_line) #----------------------------------------------------------------------------- # Function to run the dashboard through a script -function(run_dashboard_script name) +function(run_dashboard_script bin_dir) run_child( WORKING_DIRECTORY ${TOP} - COMMAND ${CMAKE_CTEST_COMMAND} -S ${name} -V + COMMAND ${CMAKE_CTEST_COMMAND} -S ${bin_dir}.cmake -V ) # Verify the updates reported by CTest. list(APPEND UPDATE_MAYBE Updated{subdir}) - check_updates(dash-binary + check_updates(${bin_dir} Updated{foo.txt} Updated{bar.txt} Updated{zot.txt} diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in index f0a5770..4ac1b31 100644 --- a/Tests/CTestUpdateGIT.cmake.in +++ b/Tests/CTestUpdateGIT.cmake.in @@ -192,15 +192,18 @@ run_child( #----------------------------------------------------------------------------- # 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 ${GIT} reset --hard master~2 - ) -run_child( - WORKING_DIRECTORY ${TOP}/user-source - COMMAND ${GIT} submodule update - ) +macro(rewind_source src_dir) + message("Backing up to revision 1...") + run_child( + WORKING_DIRECTORY ${TOP}/${src_dir} + COMMAND ${GIT} reset --hard origin/master~2 + ) + run_child( + WORKING_DIRECTORY ${TOP}/${src_dir} + COMMAND ${GIT} submodule update + ) +endmacro(rewind_source) +rewind_source(user-source) # Make sure pull does not try to rebase (which does not work with # modified files) even if ~/.gitconfig sets "branch.master.rebase". @@ -224,13 +227,31 @@ UpdateCommand: ${GIT} ") # Run the dashboard command line interface. +set(UPDATE_NO_MODIFIED 1) run_dashboard_command_line(user-binary) +set(UPDATE_NO_MODIFIED 0) + +rewind_source(user-source) +modify_content(user-source) + +message("Running CTest Dashboard Command Line (custom update)...") + +# Create the user build tree. +create_build_tree(user-source user-binary-custom) +file(APPEND ${TOP}/user-binary-custom/CTestConfiguration.ini + "# GIT command configuration +UpdateCommand: ${GIT} +GITUpdateCustom: ${GIT};pull;origin;master +") + +# Run the dashboard command line interface. +run_dashboard_command_line(user-binary-custom) #----------------------------------------------------------------------------- # Test initial checkout and update with a dashboard script. message("Running CTest Dashboard Script...") -create_dashboard_script(dashboard.cmake +create_dashboard_script(dash-binary "# git command configuration set(CTEST_GIT_COMMAND \"${GIT}\") set(CTEST_GIT_UPDATE_OPTIONS) @@ -253,4 +274,20 @@ execute_process( ") # Run the dashboard script with CTest. -run_dashboard_script(dashboard.cmake) +run_dashboard_script(dash-binary) + +rewind_source(dash-source) + +#----------------------------------------------------------------------------- +# Test custom update with a dashboard script. +message("Running CTest Dashboard Script (custom update)...") + +create_dashboard_script(dash-binary-custom + "# git command configuration +set(CTEST_GIT_COMMAND \"${GIT}\") +set(CTEST_GIT_UPDATE_OPTIONS) +set(CTEST_GIT_UPDATE_CUSTOM \${CTEST_GIT_COMMAND} pull origin master) +") + +# Run the dashboard script with CTest. +run_dashboard_script(dash-binary-custom) diff --git a/Tests/CTestUpdateGIT.sh.in b/Tests/CTestUpdateGIT.sh.in index 4761d32..e7586d6 100755 --- a/Tests/CTestUpdateGIT.sh.in +++ b/Tests/CTestUpdateGIT.sh.in @@ -1,5 +1,5 @@ #!/bin/sh -if test "x$1" = "xpull"; then +if test "x$1" = "xpull" -o "x$1" = "xreset"; then "@GIT@" "$@" && sleep 1 && touch foo.txt else exec "@GIT@" "$@" diff --git a/Tests/CTestUpdateHG.cmake.in b/Tests/CTestUpdateHG.cmake.in index f2e5f83..543ddd9 100644 --- a/Tests/CTestUpdateHG.cmake.in +++ b/Tests/CTestUpdateHG.cmake.in @@ -145,7 +145,7 @@ 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 +create_dashboard_script(dash-binary "# hg command configuration set(CTEST_HG_COMMAND \"${HG}\") set(CTEST_HG_UPDATE_OPTIONS) @@ -160,4 +160,4 @@ execute_process( ") # Run the dashboard script with CTest. -run_dashboard_script(dashboard.cmake) +run_dashboard_script(dash-binary) diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in index 509597b..97b2a07 100644 --- a/Tests/CTestUpdateSVN.cmake.in +++ b/Tests/CTestUpdateSVN.cmake.in @@ -127,7 +127,7 @@ 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 +create_dashboard_script(dash-binary "# Subversion command configuration set(CTEST_SVN_COMMAND \"${SVN}\") set(CTEST_SVN_UPDATE_OPTIONS @@ -137,4 +137,4 @@ set(CTEST_CHECKOUT_COMMAND ") # Run the dashboard script with CTest. -run_dashboard_script(dashboard.cmake) +run_dashboard_script(dash-binary) diff --git a/Tests/bootstrap.bat.in b/Tests/bootstrap.bat.in new file mode 100644 index 0000000..aeb24b1 --- /dev/null +++ b/Tests/bootstrap.bat.in @@ -0,0 +1,2 @@ +@echo off +sh "@CMake_SOURCE_DIR@/bootstrap" %* |