diff options
| author | Brad King <brad.king@kitware.com> | 2007-09-19 11:10:35 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-09-19 11:10:35 -0400 |
| commit | 4710c7aef619b34486980c74bf226986550ae3b6 (patch) | |
| tree | b0ac64a72b9400d6d6d461038311f3960246026f | |
| parent | a347abe269c3ac065f9a9d9973c8935ac055f165 (diff) | |
| download | cmake-4710c7aef619b34486980c74bf226986550ae3b6.tar.gz | |
ENH: Re-enable packaging part of SimpleInstall-Stage2 test on Apple. Give it a long timeout to see what is going on.
| -rw-r--r-- | Tests/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 2eaaa8fb5a..b31bf6adfa 100644 --- a/Tests/CMakeLists.txt +++ b/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 diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index ffbf27c6af..a0c442e316 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/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) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index ffbf27c6af..a0c442e316 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/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) |