Merge topic 'Memchecker-Mac-fix'

0aed09f Tests: ignore GuardMalloc messages on all Apple build, not just XCode ones
This commit is contained in:
Brad King 2013-05-24 09:18:56 -04:00 committed by CMake Topic Stage
commit 795e369e6b

View File

@ -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}")