kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Rename RunCMake.CTestMemcheck internals to match CTestSubmit

This commit is contained in:
Brad King 2015-02-19 11:21:55 -05:00
parent 09cdcc5430
commit 76e7c22b3c
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.9) cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheck@SUBTEST_NAME@ NONE) project(CTestTestMemcheck@CASE_NAME@ NONE)
include(CTest) include(CTest)
add_test(NAME RunCMake COMMAND "${CMAKE_COMMAND}" --version) add_test(NAME RunCMake COMMAND "${CMAKE_COMMAND}" --version)

2
Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in
View File

@ -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_NIGHTLY_START_TIME "21:00:00 EDT")
set (CTEST_DART_SERVER_VERSION "2") set (CTEST_DART_SERVER_VERSION "2")
set(CTEST_DROP_METHOD "http") set(CTEST_DROP_METHOD "http")

14
Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
View File

@ -4,18 +4,18 @@ set(SITE test-site)
set(BUILDNAME test-build) set(BUILDNAME test-build)
set(COVERAGE_COMMAND "") 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 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 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 configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in
${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/CMakeLists.txt @ONLY) ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY)
run_cmake_command(${SUBTEST_NAME} ${CMAKE_CTEST_COMMAND} run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND}
-C Debug -C Debug
-S ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/test.cmake -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake
-V -V
--output-log ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}-build/testOutput.log --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log
${ARGN} ${ARGN}
) )
endfunction() endfunction()

6
Tests/RunCMake/CTestMemcheck/test.cmake.in
View File

@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8.9)
# Settings: # Settings:
set(CTEST_SITE "@SITE@") 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_SOURCE_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@")
set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@SUBTEST_NAME@-build") set(CTEST_BINARY_DIRECTORY "@RunCMake_BINARY_DIR@/@CASE_NAME@-build")
set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@") set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@")
set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@")
set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@")