diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-19 16:21:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-19 16:26:43 (GMT) |
| commit | 76e7c22b3c37f382d6232ee95fe77e39e7aa269d (patch) | |
| tree | 89b384ac0d681ddaa8afb37b6eae1d29bd83996b /Tests | |
| parent | 09cdcc54303bf065022a997056f403dd0707bc7e (diff) | |
| download | CMake-76e7c22b3c37f382d6232ee95fe77e39e7aa269d.zip CMake-76e7c22b3c37f382d6232ee95fe77e39e7aa269d.tar.gz CMake-76e7c22b3c37f382d6232ee95fe77e39e7aa269d.tar.bz2 | |
Tests: Rename RunCMake.CTestMemcheck internals to match CTestSubmit
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake | 14 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestMemcheck/test.cmake.in | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in b/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in index d15d148..3b8edf4 100644 --- a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in +++ b/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.9) -project(CTestTestMemcheck@SUBTEST_NAME@ NONE) +project(CTestTestMemcheck@CASE_NAME@ NONE) include(CTest) add_test(NAME RunCMake COMMAND "${CMAKE_COMMAND}" --version) diff --git a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in b/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in index 19c76c2..6d4a718 100644 --- a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in +++ b/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in @@ -1,4 +1,4 @@ -set (CTEST_PROJECT_NAME "CTestTestMemcheck@SUBTEST_NAME@") +set (CTEST_PROJECT_NAME "CTestTestMemcheck@CASE_NAME@") set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT") set (CTEST_DART_SERVER_VERSION "2") set(CTEST_DROP_METHOD "http") diff --git a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake index 6485de8..005745e 100644 --- a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake @@ -4,18 +4,18 @@ set(SITE test-site) set(BUILDNAME test-build) set(COVERAGE_COMMAND "") -function(run_mc_test SUBTEST_NAME CHECKER_COMMAND) +function(run_mc_test CASE_NAME CHECKER_COMMAND) configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in - ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/test.cmake @ONLY) + ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY) configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in - ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/CTestConfig.cmake @ONLY) + ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY) configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in - ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/CMakeLists.txt @ONLY) - run_cmake_command(${SUBTEST_NAME} ${CMAKE_CTEST_COMMAND} + ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY) + run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND} -C Debug - -S ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/test.cmake + -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake -V - --output-log ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}-build/testOutput.log + --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log ${ARGN} ) endfunction() diff --git a/Tests/RunCMake/CTestMemcheck/test.cmake.in b/Tests/RunCMake/CTestMemcheck/test.cmake.in index 622d709..f9c1ba9 100644 --- a/Tests/RunCMake/CTestMemcheck/test.cmake.in +++ b/Tests/RunCMake/CTestMemcheck/test.cmake.in @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8.9) # Settings: set(CTEST_SITE "@SITE@") -set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Memcheck@SUBTEST_NAME@") +set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Memcheck@CASE_NAME@") -set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@SUBTEST_NAME@") -set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@SUBTEST_NAME@-build") +set(CTEST_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@") +set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@-build") set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@") set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") |