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

Enable BootstrapTest on MSYS 

The bootstrap script works under MSYS, so test it.  Use a launcher batch
file since 'ctest --build-and-test' is a Windows program and will not
honor the shebang line in the script.
This commit is contained in:
Brad King 2010-06-11 14:03:53 -04:00
parent b9e3c243d4
commit 5e102d5e01
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Tests/CMakeLists.txt
View File

@ -1572,16 +1572,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 # If there is CMakeLists.txt in the binary tree, assume in-source build
SET(CMAKE_SKIP_BOOTSTRAP_TEST 1) SET(CMAKE_SKIP_BOOTSTRAP_TEST 1)
ENDIF(EXISTS "${CMAKE_BINARY_DIR}/CMakeLists.txt") 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} ADD_TEST(BootstrapTest ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
${CMake_SOURCE_DIR} ${CMake_SOURCE_DIR}
${CMake_BINARY_DIR}/Tests/BootstrapTest ${CMake_BINARY_DIR}/Tests/BootstrapTest
--build-nocmake --build-nocmake
--build-noclean --build-noclean
--build-makeprogram ${CMake_SOURCE_DIR}/bootstrap --build-makeprogram ${bootstrap}
--build-generator "${CMAKE_TEST_GENERATOR}" --build-generator "${CMAKE_TEST_GENERATOR}"
--test-command --test-command
${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake) ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake)
@ -1595,7 +1603,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
SET_TESTS_PROPERTIES ( BootstrapTest SET_TESTS_PROPERTIES ( BootstrapTest
PROPERTIES TIMEOUT 5400) PROPERTIES TIMEOUT 5400)
ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND) 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 # fortran does not work for IDE builds because
# CMAKE_STANDARD_LIBRARIES needs to be per language # CMAKE_STANDARD_LIBRARIES needs to be per language

2
Tests/bootstrap.bat.in Normal file
View File

@ -0,0 +1,2 @@
@echo off
sh "@CMake_SOURCE_DIR@/bootstrap" %*