Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge topic 'Memchecker-Mac-fix'

0aed09f Tests: ignore GuardMalloc messages on all Apple build, not just XCode ones
Brad King 12 years ago
parent
3cc5d3883e 0aed09fd20
commit
795e369e6b
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      Tests/CTestTestMemcheck/CMakeLists.txt

+ 1 - 1
Tests/CTestTestMemcheck/CMakeLists.txt
View File 

@@ -33,7 +33,7 @@ target_link_libraries(memcheck_fail CMakeLib)
 
 # same filenames.
 
 # same filenames.
 
 add_subdirectory(NoLogDummyChecker)
 
 add_subdirectory(NoLogDummyChecker)
 
 
 
-if (XCODE)
 
+if (APPLE)
 
     # filter out additional messages by Guard Malloc integrated in Xcode
 
     # filter out additional messages by Guard Malloc integrated in Xcode
 
     set(GUARD_MALLOC_MSG "(ctest\([0-9]+\) malloc: [^\n]*\n)*")
 
     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}")
 
     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}")