Commit a180eb30 authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

remove valgrind checks from //content

We have not supported valgrind for some time (it was never ported to
the GN build IIUC, and has been obsoleted by ASan/MSan/TSan).

BUG=791518

Change-Id: Id24289347d0811ed51a0b9ac036c746ef18bf75f
Reviewed-on: https://chromium-review.googlesource.com/809426Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#522045}
parent 9e8728dc
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "base/rand_util.h" #include "base/rand_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "content/public/common/bind_interface_helpers.h" #include "content/public/common/bind_interface_helpers.h"
...@@ -62,10 +61,7 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) { ...@@ -62,10 +61,7 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) {
#if defined(OS_LINUX) #if defined(OS_LINUX)
// Use /proc/self/exe rather than our known binary path so updates // Use /proc/self/exe rather than our known binary path so updates
// can't swap out the binary from underneath us. // can't swap out the binary from underneath us.
// When running under Valgrind, forking /proc/self/exe ends up forking the if (child_path.empty() && flags & CHILD_ALLOW_SELF)
// Valgrind executable, which then crashes. However, it's almost safe to
// assume that the updates won't happen while testing with Valgrind tools.
if (child_path.empty() && flags & CHILD_ALLOW_SELF && !RunningOnValgrind())
child_path = base::FilePath(base::kProcSelfExe); child_path = base::FilePath(base::kProcSelfExe);
#endif #endif
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "base/task_scheduler/task_scheduler.h" #include "base/task_scheduler/task_scheduler.h"
#include "base/test/scoped_task_environment.h" #include "base/test/scoped_task_environment.h"
#include "base/test/test_discardable_memory_allocator.h" #include "base/test/test_discardable_memory_allocator.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/public/common/user_agent.h" #include "content/public/common/user_agent.h"
...@@ -92,8 +91,6 @@ void TearDownBlinkTestEnvironment() { ...@@ -92,8 +91,6 @@ void TearDownBlinkTestEnvironment() {
// http://code.google.com/p/chromium/issues/detail?id=9500 // http://code.google.com/p/chromium/issues/detail?id=9500
test_environment->RunUntilIdle(); test_environment->RunUntilIdle();
if (RunningOnValgrind())
blink::WebCache::Clear();
delete test_environment; delete test_environment;
test_environment = nullptr; test_environment = nullptr;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment