Browse Source

Fixed CTestTestRunScript

Zach Mullen 16 years ago
parent
commit
dae1011d26

+ 4 - 4
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_SOURCE_DIR}/Tests/CTestTestRunScript/hello.cmake.in"
     "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/hello.cmake"
     "${CMake_BINARY_DIR}/Tests/CTestTestRunScript/hello.cmake"
     @ONLY ESCAPE_QUOTES)
     @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)
   ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N)
   
   

+ 0 - 2
Tests/CTestTestRunScript/CMakeLists.txt

@@ -1,2 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-PROJECT(CTestTestRunScript)

+ 0 - 7
Tests/CTestTestRunScript/CTestConfig.cmake

@@ -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)

+ 2 - 6
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")

+ 2 - 11
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")