[cmake-commits] king committed CMakeLists.txt 1.85 1.86

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Disable package test only on OSX < 10.4.  Added comment explaining reason for timeout.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- CMakeLists.txt	19 Sep 2007 15:10:35 -0000	1.85
+++ CMakeLists.txt	20 Sep 2007 14:56:33 -0000	1.86
@@ -333,14 +333,25 @@
 INCLUDE(InstallRequiredSystemLibraries)
 INCLUDE(CPack)
 
-# Avoid disabling test on Apple to try to diagnose the problem.
-SET(CTEST_TEST_CPACK 1)
-
-# disable packaging on Apple, since this includes the /Applications dir
-# where a symbolic link is created by cmCPackOSXX11Generator.cxx
+# 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.
 SET(PACKAGE_TARGET --build-target package)
 IF(APPLE AND NOT CTEST_TEST_CPACK)
-  SET(PACKAGE_TARGET)
+  EXECUTE_PROCESS(
+    COMMAND sw_vers -productVersion
+    OUTPUT_VARIABLE OSX_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  IF("${OSX_VERSION}" MATCHES "^10\\.[0123]")
+    MESSAGE(STATUS "Disabling package test on OSX ${OSX_VERSION} < 10.4")
+    SET(PACKAGE_TARGET)
+  ENDIF("${OSX_VERSION}" MATCHES "^10\\.[0123]")
 ENDIF(APPLE AND NOT CTEST_TEST_CPACK)
 
 ADD_CUSTOM_COMMAND(