summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-05-05 14:19:09 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-05-05 14:19:09 (GMT)
commit3254c25e4ffea315d97b2d6d1f8d62f62c5f7627 (patch)
treeabc1c68271ff16bd679c1c87a0ccecda873de537
parentb74da8d3aaf931b335b6ddf4eb11b892f8e719c5 (diff)
downloadCMake-3254c25e4ffea315d97b2d6d1f8d62f62c5f7627.zip
CMake-3254c25e4ffea315d97b2d6d1f8d62f62c5f7627.tar.gz
CMake-3254c25e4ffea315d97b2d6d1f8d62f62c5f7627.tar.bz2
ENH: Add new style ctest project
-rw-r--r--Source/CMakeLists.txt5
-rw-r--r--Tests/CTestTest2/CMakeLists.txt12
-rw-r--r--Tests/CTestTest2/test.cmake.in32
3 files changed, 49 insertions, 0 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b8d0afc..4d2bfc7 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -731,6 +731,11 @@ IF(BUILD_TESTING)
ADD_TEST(CTestTest ${CMAKE_CTEST_COMMAND}
-S "${CMake_BINARY_DIR}/Tests/CTestTest/test.cmake" -V
)
+ CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest2/test.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" @ONLY ESCAPE_QUOTES)
+ ADD_TEST(CTestTest2 ${CMAKE_CTEST_COMMAND}
+ -S "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" -V
+ )
ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
IF("${CMAKE_GENERATOR}" MATCHES XCode)
diff --git a/Tests/CTestTest2/CMakeLists.txt b/Tests/CTestTest2/CMakeLists.txt
new file mode 100644
index 0000000..7678748
--- /dev/null
+++ b/Tests/CTestTest2/CMakeLists.txt
@@ -0,0 +1,12 @@
+PROJECT(CTestTest2)
+
+SET(DART_ROOT "" CACHE STRING "" FORCE)
+ENABLE_TESTING()
+INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+
+GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH)
+SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest")
+
+
+CONFIGURE_FILE(${CTestTest2_SOURCE_DIR}/test.cmake.in
+ ${CTestTest2_BINARY_DIR}/test.cmake @ONLY)
diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in
new file mode 100644
index 0000000..9f9a999
--- /dev/null
+++ b/Tests/CTestTest2/test.cmake.in
@@ -0,0 +1,32 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.1)
+
+# Settings:
+SET(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTest")
+SET(CTEST_SITE "@SITE@")
+SET(CTEST_BUILD_NAME "KWSys-@BUILDNAME@-CTest2")
+
+SET(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Source/kwsys")
+SET(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTest2/kwsysBin")
+SET(CTEST_CVS_COMMAND "@CVS@")
+SET(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+SET(CTEST_BUILD_CONFIGURATION "Release")
+SET(CTEST_MEMORYCHECK_COMMAND "@MEMORYCHECK_COMMAND@")
+SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
+SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS "@MEMORYCHECK_COMMAND_OPTIONS@")
+SET(CTEST_COVERAGE_COMMAND:FILEPATH "@COVERAGE_COMMAND@")
+
+CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
+
+FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
+CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
+CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
+CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
+CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
+")
+
+CTEST_START(Experimental)
+#CTEST_UPDATE(SOURCE "${CTEST_SOURCE_DIRECTORY}" RETURN_VALUE res)
+CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_SUBMIT(RETURN_VALUE res)