diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-14 18:08:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 13:26:21 (GMT) |
| commit | 1f679b8d46069696e14b3ff512fee2696c4e601e (patch) | |
| tree | a7b7c04a48a0950d265ea1620d7a048ae8b8841e /Tests | |
| parent | 8904d1410be3d62fc48d3bdaa87cbce3895fc815 (diff) | |
| download | CMake-1f679b8d46069696e14b3ff512fee2696c4e601e.zip CMake-1f679b8d46069696e14b3ff512fee2696c4e601e.tar.gz CMake-1f679b8d46069696e14b3ff512fee2696c4e601e.tar.bz2 | |
Tests: Drop remnants of unused ShellInstall test
The ShellInstall test has long been replaced by the CMake.Install test.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 13 | ||||
| -rwxr-xr-x | Tests/TestInstall.sh.in | 63 |
2 files changed, 0 insertions, 76 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 6426b3a..b6e945e 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2531,19 +2531,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ endif() endif() - if(UNIX) - string(COMPARE EQUAL "${CMAKE_INSTALL_PREFIX}" "${CMake_BINARY_DIR}/Tests/TestShellInstall/Prefix" - PREFIX_IS_FOR_TEST) - if(PREFIX_IS_FOR_TEST) - configure_file( - ${CMake_SOURCE_DIR}/Tests/TestInstall.sh.in - ${CMake_BINARY_DIR}/Tests/TestShellInstall/TestInstall.sh - @ONLY - ) - add_test(ShellInstall /bin/sh ${CMake_BINARY_DIR}/Tests/TestShellInstall/TestShellInstall.sh) - endif() - endif() - if(CMAKE_TEST_PROJECT_CSE_DIR) set(script "${CMAKE_TEST_PROJECT_CSE_DIR}/BuildProjectCSE.cmake") if(NOT EXISTS "${script}") diff --git a/Tests/TestInstall.sh.in b/Tests/TestInstall.sh.in deleted file mode 100755 index 9535780..0000000 --- a/Tests/TestInstall.sh.in +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -CMAKE_COMMAND="@CMAKE_INSTALL_PREFIX@/bin/cmake" -CMake_SOURCE_DIR="@CMake_SOURCE_DIR@" -CMake_BINARY_DIR="@CMake_BINARY_DIR@" -CMAKE_INSTALL_PREFIX="@CMAKE_INSTALL_PREFIX@" -CMAKE_BUILD_TOOL="@CMAKE_BUILD_TOOL@" - -SOURCE_DIR="${CMake_SOURCE_DIR}/Tests/Simple" -BINARY_DIR="${CMake_BINARY_DIR}/Tests/TestInstall" - -install() -{ - echo "Erasing ${CMAKE_INSTALL_PREFIX}" && - ([ ! -d "${CMAKE_INSTALL_PREFIX}" ] || rm -rf "${CMAKE_INSTALL_PREFIX}") && - mkdir -p "${CMAKE_INSTALL_PREFIX}" && - echo "Running make install" && - ( - cd "${CMake_BINARY_DIR}" && - "${CMAKE_BUILD_TOOL}" install - ) -} - -setup() -{ - echo "Entering ${BINARY_DIR}" && - cd "${BINARY_DIR}" -} - -write_cache() -{ - install || return 1 - setup || return 1 - echo "Writing CMakeCache.txt" - ( - cat > CMakeCache.txt <<EOF -EOF - ) -} - -run_cmake() -{ - write_cache || return 1 - echo "Running CMake" - "${CMAKE_COMMAND}" "${SOURCE_DIR}" -} - -run_make() -{ - run_cmake || return 1 - echo "Running ${CMAKE_BUILD_TOOL}" - "${CMAKE_BUILD_TOOL}" -} - -run_test() -{ - echo "Running ${BINARY_DIR}/simple" - ( - "${BINARY_DIR}/simple" - ) -} - -run_make && run_test |