diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-16 18:59:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-18 15:12:16 (GMT) |
| commit | 7ca6bdf0355157da9f85f6bbf039a632ffdf66b7 (patch) | |
| tree | 0665524d4973903b38fa6779d85c328b6f2305b4 /Tests | |
| parent | 1651dc96683282c0af8ef47973db9afa950d6bde (diff) | |
| download | CMake-7ca6bdf0355157da9f85f6bbf039a632ffdf66b7.zip CMake-7ca6bdf0355157da9f85f6bbf039a632ffdf66b7.tar.gz CMake-7ca6bdf0355157da9f85f6bbf039a632ffdf66b7.tar.bz2 | |
Tests: Move CTestTestMemcheck tools into Tests/CMakeLib
The dummy memcheck tools we build for the RunCMake.CTestMemcheck tests
require CMakeLib, so put them in a Tests/CMakeLib/PseudoMemcheck
directory.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt (renamed from Tests/CTestTestMemcheck/CMakeLists.txt) | 2 | ||||
| -rw-r--r-- | Tests/CMakeLib/PseudoMemcheck/NoLog/CMakeLists.txt (renamed from Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in (renamed from Tests/CTestTestMemcheck/memtester.cxx.in) | 0 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
5 files changed, 3 insertions, 5 deletions
diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt index 8c99f64..7ef3c03 100644 --- a/Tests/CMakeLib/CMakeLists.txt +++ b/Tests/CMakeLib/CMakeLists.txt @@ -48,3 +48,5 @@ if(TEST_CompileCommandOutput) add_executable(runcompilecommands run_compile_commands.cxx) target_link_libraries(runcompilecommands CMakeLib) endif() + +add_subdirectory(PseudoMemcheck) diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt index 5d6319a..c53befc 100644 --- a/Tests/CTestTestMemcheck/CMakeLists.txt +++ b/Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt @@ -23,7 +23,7 @@ target_link_libraries(memcheck_fail CMakeLib) # Binaries that are used as memchecker that do not write the expected # output file. Need to be in their own subdirectory as they have the # same filenames. -add_subdirectory(NoLogDummyChecker) +add_subdirectory(NoLog) # Xcode 2.x forgets to create the output directory before linking # the individual architectures. diff --git a/Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt b/Tests/CMakeLib/PseudoMemcheck/NoLog/CMakeLists.txt index 3a45bfe..3a45bfe 100644 --- a/Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt +++ b/Tests/CMakeLib/PseudoMemcheck/NoLog/CMakeLists.txt diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in index 43c0ba7..43c0ba7 100644 --- a/Tests/CTestTestMemcheck/memtester.cxx.in +++ b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 33c18ce..250e966 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -110,10 +110,6 @@ if(BUILD_TESTING) add_subdirectory(FindPackageModeMakefileTest) - if(NOT CMake_TEST_EXTERNAL_CMAKE) - add_subdirectory(CTestTestMemcheck) - endif() - # Collect a list of all test build directories. set(TEST_BUILD_DIRS) |