diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-07-12 08:51:51 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-07-12 08:51:51 (GMT) |
| commit | 7048373296482ee38dc7336b3d96df4dc98bcb1b (patch) | |
| tree | 843e0b1704e2b1979684c1794fdb316a20dade27 /Tests | |
| parent | 2a750cacd62e6c84cb2120a9833e0cafd1b8e338 (diff) | |
| download | CMake-7048373296482ee38dc7336b3d96df4dc98bcb1b.zip CMake-7048373296482ee38dc7336b3d96df4dc98bcb1b.tar.gz CMake-7048373296482ee38dc7336b3d96df4dc98bcb1b.tar.bz2 | |
STYLE: don't load CMakeDetermineSystem and CMakeSystemSpecific directly from
cmCTestScriptHandler, but have it load the new script CTestScriptMode.cmake
-> that makes it more flexible, also add a simple test that the system name
has been determined correctly
Alex
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/CTestScriptMode/CTestTestScriptMode.cmake.in | 14 |
2 files changed, 21 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 83e11e3..8982ac3 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -877,6 +877,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleGeneratorTest") ENDIF(APPLE AND CTEST_TEST_CPACK) + # A simple test for ctest in script mode + CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestScriptMode/CTestTestScriptMode.cmake.in" + "${CMake_BINARY_DIR}/Tests/CTestScriptMode/CTestTestScriptMode.cmake" @ONLY) + ADD_TEST(CTest.ScriptMode ${CMAKE_CTEST_COMMAND} + -S "${CMake_BINARY_DIR}/Tests/CTestScriptMode/CTestTestScriptMode.cmake" + ) + SET(CTEST_TEST_UPDATE 1) IF(CTEST_TEST_UPDATE) # Test CTest Update with Subversion diff --git a/Tests/CTestScriptMode/CTestTestScriptMode.cmake.in b/Tests/CTestScriptMode/CTestTestScriptMode.cmake.in new file mode 100644 index 0000000..0c4394f --- /dev/null +++ b/Tests/CTestScriptMode/CTestTestScriptMode.cmake.in @@ -0,0 +1,14 @@ +# This script will be executed with ctest -S + +# Check that the system name is determined correctly: +set(CMAKE_CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@") + +if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "${CMAKE_CMAKE_SYSTEM_NAME}") + message(FATAL_ERROR "Error: CMAKE_SYSTEM_NAME is \"${CMAKE_SYSTEM_NAME}\", but should be \"@CMAKE_SYSTEM_NAME@\"") +endif(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "${CMAKE_CMAKE_SYSTEM_NAME}") + +# this seems to be necessary, otherwise ctest complains that these +# variables are not set: +set(CTEST_COMMAND "\"@CMAKE_CTEST_COMMAND@\"") +set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestScriptMode/") +set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestScriptMode/") |