[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.116.2.1 1.116.2.2 CMakeWizardTest.cmake NONE 1.1.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Added Files:
      Tag: CMake-2-8
	CMakeWizardTest.cmake 
Log Message:
Merge in changes for RC 3


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.116.2.1
retrieving revision 1.116.2.2
diff -C 2 -d -r1.116.2.1 -r1.116.2.2
*** CMakeLists.txt	1 Oct 2009 21:21:22 -0000	1.116.2.1
--- CMakeLists.txt	9 Oct 2009 20:11:43 -0000	1.116.2.2
***************
*** 109,112 ****
--- 109,113 ----
    ADD_TEST_MACRO(COnly COnly)
    ADD_TEST_MACRO(CxxOnly CxxOnly)
+   ADD_TEST_MACRO(IPO COnly/COnly)
    ADD_TEST_MACRO(NewlineArgs NewlineArgs)
    ADD_TEST_MACRO(SetLang SetLang)
***************
*** 486,489 ****
--- 487,497 ----
    ENDIF(CMAKE_BASE_NAME MATCHES "^como$")
    IF(NOT COMPILER_IS_COMO)
+     SET(COMPLEX_TEST_CMAKELIB 1)
+     IF(CMAKE_TEST_DIFFERENT_GENERATOR OR CMAKE_TEST_SYSTEM_LIBRARIES)
+       SET(COMPLEX_TEST_CMAKELIB 0)
+     ENDIF(CMAKE_TEST_DIFFERENT_GENERATOR OR CMAKE_TEST_SYSTEM_LIBRARIES)
+     IF(BORLAND)
+       SET(COMPLEX_TEST_CMAKELIB 0)
+     ENDIF(BORLAND)
      ADD_TEST(complex  ${CMAKE_CTEST_COMMAND}
        --build-and-test
***************
*** 497,502 ****
        --build-exe-dir "${CMake_BINARY_DIR}/Tests/Complex/bin"
        --build-options
!       -DCMAKE_TEST_DIFFERENT_GENERATOR:BOOL=${CMAKE_TEST_DIFFERENT_GENERATOR}
!       -DCMAKE_TEST_SYSTEM_LIBRARIES:BOOL=${CMAKE_TEST_SYSTEM_LIBRARIES}
        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
        --test-command complex
--- 505,509 ----
        --build-exe-dir "${CMake_BINARY_DIR}/Tests/Complex/bin"
        --build-options
!       -DCOMPLEX_TEST_CMAKELIB:BOOL=${COMPLEX_TEST_CMAKELIB}
        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
        --test-command complex
***************
*** 513,518 ****
        --build-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin"
        --build-options
!       -DCMAKE_TEST_DIFFERENT_GENERATOR:BOOL=${CMAKE_TEST_DIFFERENT_GENERATOR}
!       -DCMAKE_TEST_SYSTEM_LIBRARIES:BOOL=${CMAKE_TEST_SYSTEM_LIBRARIES}
        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
        --test-command complex)
--- 520,524 ----
        --build-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin"
        --build-options
!       -DCOMPLEX_TEST_CMAKELIB:BOOL=${COMPLEX_TEST_CMAKELIB}
        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
        --test-command complex)
***************
*** 1312,1315 ****
--- 1318,1326 ----
    ENDIF(NOT EXISTS "${CMAKE_BINARY_DIR}/CMakeLists.txt")
  
+   ADD_TEST(CMakeWizardTest ${CMAKE_CMAKE_COMMAND}
+     -D build_dir:STRING=${CMAKE_CURRENT_BINARY_DIR}/CMakeWizardTest
+     -D source_dir:STRING=${CMAKE_CURRENT_SOURCE_DIR}/Tutorial/Step3
+     -D CMAKE_CTEST_COMMAND:STRING=${CMAKE_CTEST_COMMAND}
+     -P ${CMAKE_CURRENT_SOURCE_DIR}/CMakeWizardTest.cmake)
  ENDIF(BUILD_TESTING)
  

--- NEW FILE: CMakeWizardTest.cmake ---
message("CTEST_FULL_OUTPUT (Avoid ctest truncation of output)")

message(STATUS "build_dir='${build_dir}'")

message(STATUS "source_dir='${source_dir}'")


execute_process(COMMAND ${CMAKE_COMMAND} -E
  remove_directory ${build_dir}
  TIMEOUT 5)

execute_process(COMMAND ${CMAKE_COMMAND} -E
  make_directory ${build_dir}
  TIMEOUT 5)

execute_process(COMMAND ${CMAKE_COMMAND} -E
  copy_directory ${source_dir} ${build_dir}/src
  TIMEOUT 5)

execute_process(COMMAND ${CMAKE_COMMAND} -E
  make_directory ${build_dir}/build
  TIMEOUT 5)

# This is enough to answer 32 questions with "the default answer is ok"...
#
file(WRITE ${build_dir}/input.txt
  "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n")


message(STATUS "running wizard mode (cmake -i)...")

execute_process(COMMAND ${CMAKE_COMMAND} -i ../src
  INPUT_FILE ${build_dir}/input.txt
  WORKING_DIRECTORY ${build_dir}/build
  TIMEOUT 5
  )


message(STATUS "building...")

execute_process(COMMAND ${CMAKE_COMMAND} --build .
  WORKING_DIRECTORY ${build_dir}/build
  TIMEOUT 5
  )


message(STATUS "testing...")

execute_process(COMMAND ${CMAKE_CTEST_COMMAND}
  WORKING_DIRECTORY ${build_dir}/build
  TIMEOUT 5
  )