diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-10-29 16:46:00 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-10-29 16:46:00 (GMT) |
| commit | dae1011d268eea663712b026f5aef83996452adc (patch) | |
| tree | b7166b0fedd39ca9c1f5f9a8bb783d4f4f09c3e5 /Tests | |
| parent | 8ca41ca7fb0ac0bd02da81840d2d1db863f01406 (diff) | |
| download | CMake-dae1011d268eea663712b026f5aef83996452adc.zip CMake-dae1011d268eea663712b026f5aef83996452adc.tar.gz CMake-dae1011d268eea663712b026f5aef83996452adc.tar.bz2 | |
Fixed CTestTestRunScript
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/CTestTestRunScript/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CTestTestRunScript/CTestConfig.cmake | 7 | ||||
| -rw-r--r-- | Tests/CTestTestRunScript/hello.cmake.in | 8 | ||||
| -rw-r--r-- | Tests/CTestTestRunScript/test.cmake.in | 13 |
5 files changed, 8 insertions, 30 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 3ca2f34..7b2f5b7 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1225,10 +1225,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel "${CMake_SOURCE_DIR}/Tests/CTestTestRunScript/hello.cmake.in" "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/hello.cmake" @ONLY ESCAPE_QUOTES) - #ADD_TEST(CTestTestRunScript ${CMAKE_CTEST_COMMAND} - # -S "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/test.cmake" -V - # --output-log "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/testOutput.log" - # ) + ADD_TEST(CTestTestRunScript ${CMAKE_CTEST_COMMAND} + -S "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/test.cmake" -V + --output-log "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/testOutput.log" + ) ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N) diff --git a/Tests/CTestTestRunScript/CMakeLists.txt b/Tests/CTestTestRunScript/CMakeLists.txt deleted file mode 100644 index 355cabb..0000000 --- a/Tests/CTestTestRunScript/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -PROJECT(CTestTestRunScript) diff --git a/Tests/CTestTestRunScript/CTestConfig.cmake b/Tests/CTestTestRunScript/CTestConfig.cmake deleted file mode 100644 index 313b105..0000000 --- a/Tests/CTestTestRunScript/CTestConfig.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(CTEST_PROJECT_NAME "CTestTestRunScript") -set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT") -set(CTEST_DART_SERVER_VERSION "2") -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "www.cdash.org") -set(CTEST_DROP_LOCATION "/CDash/submit.php?project=PublicDashboard") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/Tests/CTestTestRunScript/hello.cmake.in b/Tests/CTestTestRunScript/hello.cmake.in index e2c652c..140df1e 100644 --- a/Tests/CTestTestRunScript/hello.cmake.in +++ b/Tests/CTestTestRunScript/hello.cmake.in @@ -1,6 +1,2 @@ -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") -SET(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestRunScript") -SET(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestRunScript") - -message("hello world") +SET(CTEST_RUN_CURRENT_SCRIPT 0) +MESSAGE("hello world") diff --git a/Tests/CTestTestRunScript/test.cmake.in b/Tests/CTestTestRunScript/test.cmake.in index b4ccc73..91ee65f 100644 --- a/Tests/CTestTestRunScript/test.cmake.in +++ b/Tests/CTestTestRunScript/test.cmake.in @@ -1,11 +1,2 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.1) -GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) -SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") -SET(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestRunScript") -SET(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestRunScript") -SET(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@") - -CTEST_START(Experimental) -CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}") -CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}") -CTEST_RUN_SCRIPT("${CTEST_BINARY_DIRECTORY}/hello.cmake") +SET(CTEST_RUN_CURRENT_SCRIPT 0) +CTEST_RUN_SCRIPT("CTestTestRunScript/hello.cmake") |