diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-16 18:50:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-18 15:12:15 (GMT) |
| commit | 1651dc96683282c0af8ef47973db9afa950d6bde (patch) | |
| tree | c90f83059671a3d627ff2a1220ee3a1acf9487ef /Tests/RunCMake/CMakeLists.txt | |
| parent | 1c8129795ac482b36a67d0b7131f2bbd6ad04a54 (diff) | |
| download | CMake-1651dc96683282c0af8ef47973db9afa950d6bde.zip CMake-1651dc96683282c0af8ef47973db9afa950d6bde.tar.gz CMake-1651dc96683282c0af8ef47973db9afa950d6bde.tar.bz2 | |
Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck test
The CTestTestMemcheck test cases all try to check the ctest output with
a regular expression. They fail intermittently due to ordering of the
portions of the output that come from stdout and stderr being mixed.
Convert all the test cases to use the RunCMake infrastructure to match
stdout and stderr separately.
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index e74eadd..b5e41d9 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -52,6 +52,19 @@ add_RunCMake_test(CMP0053) add_RunCMake_test(CMP0054) add_RunCMake_test(CMP0055) add_RunCMake_test(CTest) + +if(NOT CMake_TEST_EXTERNAL_CMAKE) + add_RunCMake_test(CTestMemcheck + -DPSEUDO_BC=$<TARGET_FILE:pseudo_BC> + -DPSEUDO_PURIFY=$<TARGET_FILE:pseudo_purify> + -DPSEUDO_VALGRIND=$<TARGET_FILE:pseudo_valgrind> + -DPSEUDO_BC_NOLOG=$<TARGET_FILE:pseudonl_BC> + -DPSEUDO_PURIFY_NOLOG=$<TARGET_FILE:pseudonl_purify> + -DPSEUDO_VALGRIND_NOLOG=$<TARGET_FILE:pseudonl_valgrind> + -DMEMCHECK_FAIL=$<TARGET_FILE:memcheck_fail> + ) +endif() + if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles|Ninja") add_RunCMake_test(CompilerChange) endif() |