[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.52 1.53

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Add patch for feature request #6847 - CPack components for NSIS and PackageMaker installers. Thanks to Doug Gregor for all the hard work involved with implementing this patch! Also added new test CPackComponents that is conditionally executed only when NSIS or PackageMaker installer builders are available.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.52
retrieving revision 1.53
diff -C 2 -d -r1.52 -r1.53
*** CMakeLists.txt	17 Jun 2008 14:51:37 -0000	1.52
--- CMakeLists.txt	17 Jun 2008 15:39:26 -0000	1.53
***************
*** 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.
***************
*** 260,263 ****
--- 288,306 ----
      --test-command   ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExeS2)
  
+   IF(CTEST_TEST_CPACK)
+     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_TEST_CPACK)
+ 
    ADD_TEST(X11  ${CMAKE_CTEST_COMMAND}
      --build-and-test