[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.48.2.1 1.48.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in changes from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -C 2 -d -r1.48.2.1 -r1.48.2.2
*** CMakeLists.txt	21 Apr 2008 19:21:57 -0000	1.48.2.1
--- CMakeLists.txt	25 Jun 2008 13:51:50 -0000	1.48.2.2
***************
*** 20,24 ****
      "Should the long tests be run (such as Bootstrap)." ON)
    MARK_AS_ADVANCED(CMAKE_RUN_LONG_TESTS)
!   
    IF (CMAKE_RUN_LONG_TESTS)
      OPTION(CTEST_TEST_CTEST 
--- 20,24 ----
      "Should the long tests be run (such as Bootstrap)." ON)
    MARK_AS_ADVANCED(CMAKE_RUN_LONG_TESTS)
! 
    IF (CMAKE_RUN_LONG_TESTS)
      OPTION(CTEST_TEST_CTEST 
***************
*** 28,31 ****
--- 28,59 ----
    ENDIF (CMAKE_RUN_LONG_TESTS)
  
+   # Should CPack tests be run? By default, yes, but...
+   #
+   # Disable packaging test on Apple 10.3 and below. PackageMaker starts
+   # DiskManagementTool as root and disowns it
+   # (http://lists.apple.com/archives/installer-dev/2005/Jul/msg00005.html).
+   # It is left holding open pipe handles and preventing ProcessUNIX from
+   # detecting end-of-data even after its immediate child exits. Then
+   # the test hangs until it times out and is killed. This is a
+   # well-known bug in kwsys process execution that I would love to get
+   # time to fix.
+   #
+   OPTION(CTEST_TEST_CPACK
+     "Should the tests that use '--build-target package' be run?"
+     ON)
+   MARK_AS_ADVANCED(CTEST_TEST_CPACK)
+   IF(APPLE AND CTEST_TEST_CPACK)
+     EXECUTE_PROCESS(
+       COMMAND sw_vers -productVersion
+       OUTPUT_VARIABLE OSX_VERSION
+       OUTPUT_STRIP_TRAILING_WHITESPACE
+       )
+     IF(OSX_VERSION MATCHES "^10\\.[0123]" OR OSX_VERSION MATCHES "ProductVersion:\t10\\.[0123]")
+       MESSAGE(STATUS "Forcing CTEST_TEST_CPACK=OFF on OSX < 10.4")
+       MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
+       SET(CTEST_TEST_CPACK OFF)
+     ENDIF(OSX_VERSION MATCHES "^10\\.[0123]" OR OSX_VERSION MATCHES "ProductVersion:\t10\\.[0123]")
+   ENDIF(APPLE AND CTEST_TEST_CPACK)
+ 
    # Use 1500 or CTEST_TEST_TIMEOUT for long test timeout value,
    # whichever is greater.
***************
*** 41,44 ****
--- 69,73 ----
    ADD_TEST_MACRO(CommandLineTest CommandLineTest)
    ADD_TEST_MACRO(FindPackageTest FindPackageTest)
+   ADD_TEST_MACRO(FindModulesExecuteAll FindModulesExecuteAll)
    ADD_TEST_MACRO(StringFileTest StringFileTest)
    ADD_TEST_MACRO(TryCompile TryCompile)
***************
*** 259,262 ****
--- 288,326 ----
      --test-command   ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExeS2)
  
+   # By default, run the CPackComponents test if the CTEST_TEST_CPACK
+   # option is ON:
+   #
+   set(CTEST_RUN_CPackComponents ${CTEST_TEST_CPACK})
+ 
+   # But on Windows, only run the CPackComponents test if the NSIS
+   # installer builder is available:
+   #
+   if(WIN32)
+     find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis
+       PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
+       DOC "makensis.exe location"
+       )
+     if(NSIS_MAKENSIS_EXECUTABLE)
+       set(CTEST_RUN_CPackComponents ON)
+     else(NSIS_MAKENSIS_EXECUTABLE)
+       set(CTEST_RUN_CPackComponents OFF)
+     endif(NSIS_MAKENSIS_EXECUTABLE)
+   endif(WIN32)
+ 
+   IF(CTEST_RUN_CPackComponents)
+     ADD_TEST(CPackComponents ${CMAKE_CTEST_COMMAND}
+       --build-and-test
+       "${CMake_SOURCE_DIR}/Tests/CPackComponents"
+       "${CMake_BINARY_DIR}/Tests/CPackComponents"
+       --build-generator ${CMAKE_TEST_GENERATOR}
+       --build-project CPackComponents
+       --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+       --build-two-config
+       --build-target package
+       --test-command ${CMAKE_CMAKE_COMMAND}
+         "-DCPackComponents_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackComponents"
+         -P "${CMake_SOURCE_DIR}/Tests/CPackComponents/VerifyResult.cmake")
+   ENDIF(CTEST_RUN_CPackComponents)
+ 
    ADD_TEST(X11  ${CMAKE_CTEST_COMMAND}
      --build-and-test