diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-24 13:18:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-24 13:18:56 (GMT) |
| commit | 795e369e6b23e397e6cd8a8fe7769790f7e2800d (patch) | |
| tree | 1c7273557fde3d96f326fc67802ec26ca81b597a | |
| parent | 3cc5d3883e295f231ed449721c43699fbd205a0b (diff) | |
| parent | 0aed09fd20b841a34381584b2058e1f994154f74 (diff) | |
| download | CMake-795e369e6b23e397e6cd8a8fe7769790f7e2800d.zip CMake-795e369e6b23e397e6cd8a8fe7769790f7e2800d.tar.gz CMake-795e369e6b23e397e6cd8a8fe7769790f7e2800d.tar.bz2 | |
Merge topic 'Memchecker-Mac-fix'
0aed09f Tests: ignore GuardMalloc messages on all Apple build, not just XCode ones
| -rw-r--r-- | Tests/CTestTestMemcheck/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt index 59d6816..60df75c 100644 --- a/Tests/CTestTestMemcheck/CMakeLists.txt +++ b/Tests/CTestTestMemcheck/CMakeLists.txt @@ -33,7 +33,7 @@ target_link_libraries(memcheck_fail CMakeLib) # same filenames. add_subdirectory(NoLogDummyChecker) -if (XCODE) +if (APPLE) # filter out additional messages by Guard Malloc integrated in Xcode set(GUARD_MALLOC_MSG "(ctest\([0-9]+\) malloc: [^\n]*\n)*") set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+ Passed +[0-9]+\\.[0-9]+ sec\n${GUARD_MALLOC_MSG}\n${GUARD_MALLOC_MSG}100% tests passed, 0 tests failed out of 1\n.*\n-- Processing memory checking output: \n${GUARD_MALLOC_MSG}Memory checking results:\n${GUARD_MALLOC_MSG}") |