Fix ProcMapsTest.ReadProcMaps to work under Valgrind.

base/debug/proc_maps_linux_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/proc_maps_linux.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
+#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace debug {
 
 TEST(ProcMapsTest, Empty) {
   std::vector<MappedMemoryRegion> regions;
   EXPECT_TRUE(ParseProcMaps("", &regions));
   EXPECT_EQ(0u, regions.size());
 }
@@ skipping 171 matching lines @@
   // We should be able to find both the current executable as well as the stack
   // mapped into memory. Use the address of |proc_maps| as a way of finding the
   // stack.
   FilePath exe_path;
   EXPECT_TRUE(PathService::Get(FILE_EXE, &exe_path));
   uintptr_t address = reinterpret_cast<uintptr_t>(&proc_maps);
   bool found_exe = false;
   bool found_stack = false;
   for (size_t i = 0; i < regions.size(); ++i) {
     if (regions[i].path == exe_path.value()) {
+      // It's OK to find the executable mapped multiple times as there'll be
+      // multiple sections (e.g., text, data).
       found_exe = true;
     }
 
-    if (address >= regions[i].start && address < regions[i].end) {
-      EXPECT_EQ("[stack]", regions[i].path);
+    if (regions[i].path == "[stack]") {

[Mark Mentovai, 2013/07/04 01:28:13]

So now you’re looking for duplicate stacks based on their saying [stack] and not
based on the addresses containing the target address more than once. Hmm, I
think it’s a better test to look for the addresses (or do both).

[scherkus (not reviewing), 2013/07/04 01:44:39]

Ooooo I like both. Done.

+      // Only check if |address| lies within the real stack when not running
+      // Valgrind, otherwise |address| will be on a stack that Valgrind creates.
+      if (!RunningOnValgrind()) {
+        EXPECT_GE(address, regions[i].start);
+        EXPECT_LT(address, regions[i].end);
+      }
+
       EXPECT_TRUE(regions[i].permissions & MappedMemoryRegion::READ);
       EXPECT_TRUE(regions[i].permissions & MappedMemoryRegion::WRITE);
       EXPECT_FALSE(regions[i].permissions & MappedMemoryRegion::EXECUTE);
       EXPECT_TRUE(regions[i].permissions & MappedMemoryRegion::PRIVATE);
       EXPECT_FALSE(found_stack) << "Found duplicate stacks";
       found_stack = true;
     }
   }
 
   EXPECT_TRUE(found_exe);
@@ skipping 34 matching lines @@
 
   for (size_t i = 0; i < arraysize(kTestCases); ++i) {
     SCOPED_TRACE(base::StringPrintf("kTestCases[%zu] = %s", i, kTestCases[i]));
     std::vector<MappedMemoryRegion> regions;
     EXPECT_FALSE(ParseProcMaps(kTestCases[i], &regions));
   }
 }
 
 }  // namespace debug
 }  // namespace base