commit 86bad2518ec6deeae765c0a8acf3b6867f4337e2
author Christopher Ferris <cferris@google.com> Wed Sep 26 20:40:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 26 20:40:53 2018 +0000
tree 0c11e73bc7dfcbca95d751e765ffa94f80fef032
parent 567e373eb48ec6135881b8f36441f9e50f041cd0
parent fc501f440e2d4b8063bcfbe68e798852f7bcb427

Merge "Allow --gtest_print_time without a value."

tests/SystemTests.cpp

diff --git a/tests/SystemTests.cpp b/tests/SystemTests.cpp
index 194731c..57d7656 100644
--- a/tests/SystemTests.cpp
+++ b/tests/SystemTests.cpp
@@ -15,7 +15,9 @@
  */
 
 #include <fcntl.h>
+#if !defined(__APPLE__)
 #include <malloc.h>
+#endif
 #include <signal.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -1205,12 +1207,16 @@
 }
 
 TEST(SystemTestsMemory, DISABLED_memory) {
+#if !defined(__APPLE__)
   struct mallinfo info = mallinfo();
 #if defined(__ANDROID__)
   printf("Allocated %zu\n", info.uordblks);
 #else
   printf("Allocated %d\n", info.uordblks);
 #endif
+#else
+  printf("Allocated 0\n");
+#endif
 }
 
 }  // namespace gtest_extras