Browse Source

ENH: Re-enable packaging part of SimpleInstall-Stage2 test on Apple. Give it a long timeout to see what is going on.

Brad King 18 years ago
parent
commit
4710c7aef6
3 changed files with 12 additions and 0 deletions
  1. 6 0
      Tests/CMakeLists.txt
  2. 3 0
      Tests/SimpleInstall/CMakeLists.txt
  3. 3 0
      Tests/SimpleInstallS2/CMakeLists.txt

+ 6 - 0
Tests/CMakeLists.txt

@@ -195,6 +195,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
     "-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}"
     "-DSTAGE2:BOOL=1"
     --test-command   ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstallS2)
+  IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
+    IF(APPLE)
+      # Set a really long timeout on apple to see if the test finishes.
+      SET_TESTS_PROPERTIES(SimpleInstall-Stage2 PROPERTIES TIMEOUT 50000)
+    ENDIF(APPLE)
+  ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
 
   ADD_TEST(X11  ${CMAKE_CTEST_COMMAND}
     --build-and-test

+ 3 - 0
Tests/SimpleInstall/CMakeLists.txt

@@ -333,6 +333,9 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
 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
 SET(PACKAGE_TARGET --build-target package)

+ 3 - 0
Tests/SimpleInstallS2/CMakeLists.txt

@@ -333,6 +333,9 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
 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
 SET(PACKAGE_TARGET --build-target package)