summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/process_util_linux.cc2
-rw-r--r--base/process_util_unittest.cc6
2 files changed, 8 insertions, 0 deletions
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc
index 8d48824..5d83bd6 100644
--- a/base/process_util_linux.cc
+++ b/base/process_util_linux.cc
@@ -517,6 +517,8 @@ extern "C" {
// it breaks builds depending on fine details of the linker command line and
// the dependencies of other .so's that we pull in. So it's disabled for the
// moment. See crbug.com/31809
+//
+// If enabling this, remember to reanble the tests in process_util_unittest.cc
#if 0
#if !defined(LINUX_USE_TCMALLOC)
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 4b313a3..366c794 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -388,6 +388,10 @@ TEST_F(ProcessUtilTest, ParseProcStatCPU) {
#endif // defined(OS_POSIX)
+#if 0
+
+// See comments in process_util_linux.cc about why these are removed for now.
+
// TODO(vandebo) make this work on Windows and Mac too.
#if defined(OS_LINUX)
@@ -495,4 +499,6 @@ TEST_F(OutOfMemoryTest, __libc_memalign) {
#endif // defined(OS_LINUX)
+#endif
+
} // namespace base