Commit 4710c7ae authored by Brad King's avatar Brad King
Browse files

ENH: Re-enable packaging part of SimpleInstall-Stage2 test on Apple. Give it...

ENH: Re-enable packaging part of SimpleInstall-Stage2 test on Apple.  Give it a long timeout to see what is going on.
parent a347abe2
...@@ -195,6 +195,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel ...@@ -195,6 +195,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
"-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}" "-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}"
"-DSTAGE2:BOOL=1" "-DSTAGE2:BOOL=1"
--test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstallS2) --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} ADD_TEST(X11 ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
......
...@@ -333,6 +333,9 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1) ...@@ -333,6 +333,9 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
INCLUDE(InstallRequiredSystemLibraries) INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(CPack) 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 # disable packaging on Apple, since this includes the /Applications dir
# where a symbolic link is created by cmCPackOSXX11Generator.cxx # where a symbolic link is created by cmCPackOSXX11Generator.cxx
SET(PACKAGE_TARGET --build-target package) SET(PACKAGE_TARGET --build-target package)
......
...@@ -333,6 +333,9 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1) ...@@ -333,6 +333,9 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
INCLUDE(InstallRequiredSystemLibraries) INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(CPack) 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 # disable packaging on Apple, since this includes the /Applications dir
# where a symbolic link is created by cmCPackOSXX11Generator.cxx # where a symbolic link is created by cmCPackOSXX11Generator.cxx
SET(PACKAGE_TARGET --build-target package) SET(PACKAGE_TARGET --build-target package)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment